diff options
author | Miklos Szeredi <mszeredi@suse.cz> | 2012-08-15 07:01:24 -0400 |
---|---|---|
committer | Miklos Szeredi <mszeredi@suse.cz> | 2012-08-15 07:01:24 -0400 |
commit | e68726ff72cf7ba5e7d789857fcd9a75ca573f03 (patch) | |
tree | 7d5f3416543a750574955fdef5f12b3dd498de05 | |
parent | ddf343f635fe4440cad528e12f96f28bd50aa099 (diff) |
vfs: canonicalize create mode in build_open_flags()
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>
CC: stable@vger.kernel.org
-rw-r--r-- | fs/open.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -852,9 +852,10 @@ static inline int build_open_flags(int flags, umode_t mode, struct open_flags *o | |||
852 | int lookup_flags = 0; | 852 | int lookup_flags = 0; |
853 | int acc_mode; | 853 | int acc_mode; |
854 | 854 | ||
855 | if (!(flags & O_CREAT)) | 855 | if (flags & O_CREAT) |
856 | mode = 0; | 856 | op->mode = (mode & S_IALLUGO) | S_IFREG; |
857 | op->mode = mode; | 857 | else |
858 | op->mode = 0; | ||
858 | 859 | ||
859 | /* Must never be set by userspace */ | 860 | /* Must never be set by userspace */ |
860 | flags &= ~FMODE_NONOTIFY; | 861 | flags &= ~FMODE_NONOTIFY; |