aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-08-26 11:01:04 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-09-26 21:10:01 -0400
commitc6f3d81115989e274c42a852222b80d2e14ced6f (patch)
tree8a0e17df64381ab883acd76f5190b33fc80126ea
parentddd3e0771bc7b869c550687c204e21f0155d5496 (diff)
don't leak O_CLOEXEC into ->f_flags
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/open.c2
-rw-r--r--fs/proc/fd.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/open.c b/fs/open.c
index 30760017deed..03028d0e7487 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -814,7 +814,7 @@ static inline int build_open_flags(int flags, umode_t mode, struct open_flags *o
814 op->mode = 0; 814 op->mode = 0;
815 815
816 /* Must never be set by userspace */ 816 /* Must never be set by userspace */
817 flags &= ~FMODE_NONOTIFY; 817 flags &= ~FMODE_NONOTIFY & ~O_CLOEXEC;
818 818
819 /* 819 /*
820 * O_SYNC is implemented as __O_SYNC|O_DSYNC. As many places only 820 * O_SYNC is implemented as __O_SYNC|O_DSYNC. As many places only
diff --git a/fs/proc/fd.c b/fs/proc/fd.c
index 9cef449c0f76..f28a875f8779 100644
--- a/fs/proc/fd.c
+++ b/fs/proc/fd.c
@@ -36,7 +36,7 @@ static int seq_show(struct seq_file *m, void *v)
36 if (file) { 36 if (file) {
37 struct fdtable *fdt = files_fdtable(files); 37 struct fdtable *fdt = files_fdtable(files);
38 38
39 f_flags = file->f_flags & ~O_CLOEXEC; 39 f_flags = file->f_flags;
40 if (close_on_exec(fd, fdt)) 40 if (close_on_exec(fd, fdt))
41 f_flags |= O_CLOEXEC; 41 f_flags |= O_CLOEXEC;
42 42