diff options
| author | Miklos Szeredi <mszeredi@suse.cz> | 2012-08-15 13:01:24 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-09-12 03:37:03 +0100 |
| commit | 8dd138a98241fc7be5d89950e6e09bbc18024a53 (patch) | |
| tree | feb5548ccc04acb54d635bfb29f8b3c7ae49bc78 /fs/open.c | |
| parent | c2cc94c67ca8e3c496a790d631fd1ac38d31d522 (diff) | |
vfs: canonicalize create mode in build_open_flags()
commit e68726ff72cf7ba5e7d789857fcd9a75ca573f03 upstream.
Userspace can pass weird create mode in open(2) that we canonicalize to
"(mode & S_IALLUGO) | S_IFREG" in vfs_create().
The problem is that we use the uncanonicalized mode before calling vfs_create()
with unforseen consequences.
So do the canonicalization early in build_open_flags().
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Tested-by: Richard W.M. Jones <rjones@redhat.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs/open.c')
| -rw-r--r-- | fs/open.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/open.c b/fs/open.c index e2b5d515bfc..b8485d3cef9 100644 --- a/fs/open.c +++ b/fs/open.c @@ -882,9 +882,10 @@ static inline int build_open_flags(int flags, int mode, struct open_flags *op) int lookup_flags = 0; int acc_mode; - if (!(flags & O_CREAT)) - mode = 0; - op->mode = mode; + if (flags & O_CREAT) + op->mode = (mode & S_IALLUGO) | S_IFREG; + else + op->mode = 0; /* Must never be set by userspace */ flags &= ~FMODE_NONOTIFY; |