linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Miklos Szeredi <miklos@szeredi.hu>
To: viro@ZenIV.linux.org.uk
Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
	rjones@redhat.com, steveamigauk@yahoo.co.uk, mszeredi@suse.cz,
	stable@vger.kernel.org
Subject: [PATCH 1/4] vfs: canonicalize create mode in build_open_flags()
Date: Wed, 15 Aug 2012 15:59:56 +0200	[thread overview]
Message-ID: <1345039199-5904-2-git-send-email-miklos@szeredi.hu> (raw)
In-Reply-To: <1345039199-5904-1-git-send-email-miklos@szeredi.hu>

From: Miklos Szeredi <mszeredi@suse.cz>

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
---
 fs/open.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/fs/open.c b/fs/open.c
index bc132e1..e1f2cdb 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -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;
-- 
1.7.7


  reply	other threads:[~2012-08-15 13:58 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-15 13:59 [PATCH 0/4] vfs: fix file creation mode bugs Miklos Szeredi
2012-08-15 13:59 ` Miklos Szeredi [this message]
2012-08-15 13:59 ` [PATCH 2/4] vfs: atomic_open(): fix create mode usage Miklos Szeredi
2012-08-15 13:59 ` [PATCH 3/4] vfs: pass right create mode to may_o_create() Miklos Szeredi
2012-08-15 13:59 ` [PATCH 4/4] fuse: check create mode in atomic open Miklos Szeredi
  -- strict thread matches above, loose matches on Subject: below --
2012-08-07 12:45 [PATCH 0/4] vfs: fix file creation mode bugs Miklos Szeredi
2012-08-07 12:45 ` [PATCH 1/4] vfs: canonicalize create mode in build_open_flags() Miklos Szeredi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1345039199-5904-2-git-send-email-miklos@szeredi.hu \
    --to=miklos@szeredi.hu \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mszeredi@suse.cz \
    --cc=rjones@redhat.com \
    --cc=stable@vger.kernel.org \
    --cc=steveamigauk@yahoo.co.uk \
    --cc=viro@ZenIV.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).