diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-08-26 11:01:04 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-09-26 21:10:01 -0400 |
| commit | c6f3d81115989e274c42a852222b80d2e14ced6f (patch) | |
| tree | 8a0e17df64381ab883acd76f5190b33fc80126ea /fs | |
| parent | ddd3e0771bc7b869c550687c204e21f0155d5496 (diff) | |
| download | linux-3.10-c6f3d81115989e274c42a852222b80d2e14ced6f.tar.gz linux-3.10-c6f3d81115989e274c42a852222b80d2e14ced6f.tar.bz2 linux-3.10-c6f3d81115989e274c42a852222b80d2e14ced6f.zip | |
don't leak O_CLOEXEC into ->f_flags
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/open.c | 2 | ||||
| -rw-r--r-- | fs/proc/fd.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/open.c b/fs/open.c index 30760017dee..03028d0e748 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 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 diff --git a/fs/proc/fd.c b/fs/proc/fd.c index 9cef449c0f7..f28a875f877 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) 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; |