aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2012-08-15 13:01:24 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-14 10:00:37 -0700
commit3db5984ef1f9ca0f47be7751a26ce776eba20b1b (patch)
treea4a9c431865325f79623bd86309f9846a799caba
parent57dba9b60a1ad31042a8e90fafe2a58fba789177 (diff)
downloadkernel_samsung_smdk4412-3db5984ef1f9ca0f47be7751a26ce776eba20b1b.zip
kernel_samsung_smdk4412-3db5984ef1f9ca0f47be7751a26ce776eba20b1b.tar.gz
kernel_samsung_smdk4412-3db5984ef1f9ca0f47be7751a26ce776eba20b1b.tar.bz2
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/open.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/open.c b/fs/open.c
index 7e18c4d..bf00a86 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -900,9 +900,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;