--- Makefile.am | 4 - lib.c | 7 ++- mbox.c | 5 ++ mh.c | 9 +++- mutt.h | 5 +- opennfs.c | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ sendlib.c | 4 + 7 files changed, 151 insertions(+), 5 deletions(-) --- Makefile.am +++ Makefile.am 2017-04-28 13:01:24.850494937 +0000 @@ -43,7 +43,7 @@ mutt_SOURCES = addrbook.c alias.c ascii. date.c edit.c editmsg.c enter.c filter.c flags.c from.c getdomain.c \ group.c handler.c hash.c hdrline.c headers.c help.c history.c hook.c \ init.c keymap.c lib.c main.c mbox.c mbyte.c menu.c mh.c muttlib.c \ - mutt_idna.c mutt_sasl_plain.c mx.c pager.c parse.c pattern.c \ + mutt_idna.c mutt_sasl_plain.c mx.c opennfs.c pager.c parse.c pattern.c \ postpone.c query.c recvattach.c recvcmd.c rfc1524.c rfc2047.c \ rfc2231.c rfc3676.c rfc822.c safe_asprintf.c score.c send.c sendlib.c \ signal.c sort.c status.c system.c thread.c url.c version.c @@ -99,7 +99,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c mutt_dotlock_LDADD = $(LIBOBJS) mutt_dotlock_DEPENDENCIES = $(LIBOBJS) -pgpring_SOURCES = ascii.c extlib.c lib.c md5.c pgplib.c pgppacket.c \ +pgpring_SOURCES = ascii.c extlib.c lib.c opennfs.c md5.c pgplib.c pgppacket.c \ pgppubring.c sha1.c pgpring_LDADD = $(LIBOBJS) $(INTLLIBS) pgpring_DEPENDENCIES = $(LIBOBJS) $(INTLDEPS) --- lib.c +++ lib.c 2017-04-28 13:06:30.924636428 +0000 @@ -34,6 +34,7 @@ #include #include #include +#include "mutt.h" #include "lib.h" #ifdef HAVE_SYSEXITS_H @@ -640,6 +641,10 @@ int safe_open(const char *path, int flag struct stat osb, nsb; int fd; +#if defined(__linux__) + if ((fd = opennfs (path, flags, 0600)) < 0) + return fd; +#else if (flags & O_EXCL) { char safe_file[_POSIX_PATH_MAX]; @@ -662,7 +667,7 @@ int safe_open(const char *path, int flag if ((fd = open(path, flags & ~O_EXCL, 0600)) < 0) return fd; - +#endif /* make sure the file is not symlink */ if (lstat(path, &osb) < 0 || fstat(fd, &nsb) < 0 || !compare_stat(&osb, &nsb)) { --- mbox.c +++ mbox.c 2017-04-28 13:09:43.360964197 +0000 @@ -1055,8 +1055,13 @@ static int mbox_sync_mailbox(CONTEXT *ct /* Create a temporary file to write the new version of the mailbox in. */ mutt_mktemp(tempfile, sizeof(tempfile)); +#if defined(__linux__) + if ((i = opennfs(tempfile, O_WRONLY | O_EXCL | O_CREAT, 0600)) == -1 || + (fp = fdopen(i, "w")) == NULL) +#else if ((i = open(tempfile, O_WRONLY | O_EXCL | O_CREAT, 0600)) == -1 || (fp = fdopen(i, "w")) == NULL) +#endif { if (-1 != i) { --- mh.c +++ mh.c 2017-04-28 13:11:02.323457092 +0000 @@ -353,7 +353,11 @@ static int mh_mkstemp(CONTEXT *dest, FIL { snprintf(path, _POSIX_PATH_MAX, "%s/.mutt-%s-%d-%" PRIu64, dest->path, NONULL(Hostname), (int) getpid(), mutt_rand64()); +#if defined(__linux__) + if ((fd = opennfs(path, O_WRONLY | O_EXCL | O_CREAT, 0666)) == -1) +#else if ((fd = open(path, O_WRONLY | O_EXCL | O_CREAT, 0666)) == -1) +#endif { if (errno != EEXIST) { @@ -1492,8 +1496,11 @@ static int maildir_open_new_message(MESS subdir, (long long) time(NULL), mutt_rand64(), NONULL(Hostname), suffix); mutt_debug(2, "maildir_open_new_message (): Trying %s.\n", path); - +#if defined(__linux__) + if ((fd = opennfs(path, O_WRONLY | O_EXCL | O_CREAT, 0666)) == -1) +#else if ((fd = open(path, O_WRONLY | O_EXCL | O_CREAT, 0666)) == -1) +#endif { if (errno != EEXIST) { --- mutt.h +++ mutt.h 2017-04-28 13:13:38.944467312 +0000 @@ -1150,4 +1150,7 @@ typedef struct #include "lib.h" #include "protos.h" -#endif /* _MUTT_H */ +#if defined(__linux__) +extern int opennfs(const char *, int, int); +#endif +#endif /* _MUTT_H */ --- opennfs.c +++ opennfs.c 2017-04-28 12:56:59.243588127 +0000 @@ -0,0 +1,122 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef NFS_SUPER_MAGIC +# define NFS_SUPER_MAGIC 0x6969 +#endif + +int opennfs(const char *path, int flags, int mode) +{ + char tmplock[NFS_MAXPATHLEN+1], sysname[256]; + char *slash, *ptr, *dir, *base, *clear = (char*)0; + struct stat ps, ts; + struct statfs fs; + ssize_t len; + int ret; + + if ((flags & (O_WRONLY|O_RDWR)) == 0) + goto safe; + + if ((flags & (O_EXCL|O_CREAT)) != (O_EXCL|O_CREAT)) + goto safe; + +#if defined(O_NOFOLLOW) + flags |= O_NOFOLLOW; +#endif + + ret = -1; + if ((clear = strdup(path)) == (char*)0) + goto err; + dir = dirname(clear); + + if ((ret = (statfs(dir, &fs))) < 0) + goto err; + + if (fs.f_type != NFS_SUPER_MAGIC) + goto safe; + + if ((ret = gethostname(sysname, sizeof(sysname))) < 0) + goto err; + + ret = -1; + ptr = &tmplock[0]; + if (((len = snprintf(ptr, NFS_MAXPATHLEN, "%s/.%s-XXXXXX", dir, sysname)) < 0) || (len >= NFS_MAXPATHLEN)) + goto err; + ptr += len; + slash = ptr; + + free(clear); + clear = (char*)0; + + if (mkdtemp(tmplock) == (char*)0) + goto err; + + ret = -1; + if ((clear = strdup(path)) == (char*)0) + goto rmd; + base = basename(clear); + + ret = -1; + if (((len = snprintf(ptr, NFS_MAXPATHLEN - len, "/%s", base)) < 0) || (len >= (NFS_MAXPATHLEN - len))) + goto rmd; + + free(clear); + clear = (char*)0; + + if ((ret = open(tmplock, flags, mode)) < 0) + goto rmd; + + errno = 0; + do { + len = write(ret, "0", 2); + } while ((len < 0) && (errno == EINTR)); + close(ret); + + ret = -1; + errno = EBADF; + if (len != 2) + goto unl; + + errno = 0; + if ((ret = lstat(tmplock, &ts)) < 0) + goto unl; + + if (((ret = link(tmplock, path)) < 0) && (errno == EEXIST)) + goto unl; + + if ((ret = lstat(path, &ps)) < 0) + goto unl; + + ret = -1; + errno = EEXIST; + if (ps.st_nlink != 2) + goto unl; + if ((ps.st_rdev != ts.st_rdev) || (ps.st_ino != ts.st_ino)) + goto unl; + + errno = 0; + flags |= O_TRUNC; + flags &= ~(O_EXCL|O_CREAT); + ret = open(path, flags, mode); +unl: + unlink(tmplock); +rmd: + *slash = '\0'; + rmdir(tmplock); +err: + if (clear) free(clear); + return ret; +safe: + if (clear) free(clear); + return open(path, flags, mode); +} --- sendlib.c +++ sendlib.c 2017-04-28 13:13:54.220175677 +0000 @@ -2230,7 +2230,11 @@ static int send_msg(const char *path, ch if (SendmailWait >= 0 && tempfile && *tempfile) { /* *tempfile will be opened as stdout */ +#if defined(__linux__) + if (opennfs(*tempfile, O_WRONLY | O_APPEND | O_CREAT | O_EXCL, 0600) < 0) +#else if (open(*tempfile, O_WRONLY | O_APPEND | O_CREAT | O_EXCL, 0600) < 0) +#endif _exit(S_ERR); /* redirect stderr to *tempfile too */ if (dup(1) < 0)