Skip to content

Commit

Permalink
vfs: canonicalize create mode in build_open_flags()
Browse files Browse the repository at this point in the history
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 <[email protected]>
Tested-by: Richard W.M. Jones <[email protected]>
CC: [email protected]
  • Loading branch information
Miklos Szeredi committed Aug 15, 2012
1 parent ddf343f commit e68726f
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions fs/open.c
Original file line number Diff line number Diff line change
Expand Up @@ -852,9 +852,10 @@ static inline int build_open_flags(int flags, umode_t mode, struct open_flags *o
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;
Expand Down

0 comments on commit e68726f

Please sign in to comment.