commit c6f3d81115989e274c42a852222b80d2e14ced6f
author Al Viro <viro@zeniv.linux.org.uk> Sun Aug 26 11:01:04 2012 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Wed Sep 26 21:10:01 2012 -0400
tree 8a0e17df64381ab883acd76f5190b33fc80126ea
parent ddd3e0771bc7b869c550687c204e21f0155d5496

don't leak O_CLOEXEC into ->f_flags

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

fs/open.c

diff --git a/fs/open.c b/fs/open.c
index 3076001..03028d0 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -814,7 +814,7 @@
 		op->mode = 0;
 
 	/* Must never be set by userspace */
-	flags &= ~FMODE_NONOTIFY;
+	flags &= ~FMODE_NONOTIFY & ~O_CLOEXEC;
 
 	/*
 	 * O_SYNC is implemented as __O_SYNC|O_DSYNC.  As many places only

fs/proc/fd.c

diff --git a/fs/proc/fd.c b/fs/proc/fd.c
index 9cef449..f28a875 100644
--- a/fs/proc/fd.c
+++ b/fs/proc/fd.c
@@ -36,7 +36,7 @@
 		if (file) {
 			struct fdtable *fdt = files_fdtable(files);
 
-			f_flags = file->f_flags & ~O_CLOEXEC;
+			f_flags = file->f_flags;
 			if (close_on_exec(fd, fdt))
 				f_flags |= O_CLOEXEC;