diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2013-05-04 20:40:51 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-05-04 20:40:51 +0200 |
| commit | 0d5cadb87e0fa764db7fa0b78d8a6f173cb475a1 (patch) | |
| tree | f3c926479384f1b1292260b7463f79b8705d70de /fs/namespace.c | |
| parent | Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| download | linux-0d5cadb87e0fa764db7fa0b78d8a6f173cb475a1.tar.xz linux-0d5cadb87e0fa764db7fa0b78d8a6f173cb475a1.zip | |
do_mount(): fix a leak introduced in 3.9 ("mount: consolidate permission checks")
Cc: stable@vger.kernel.org
Bisected-by: Michael Leun <lkml20130126@newton.leun.net>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to '')
| -rw-r--r-- | fs/namespace.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index b4f96a5230a3..b68eef2d592a 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -2284,12 +2284,11 @@ long do_mount(const char *dev_name, const char *dir_name, retval = security_sb_mount(dev_name, &path, type_page, flags, data_page); + if (!retval && !may_mount()) + retval = -EPERM; if (retval) goto dput_out; - if (!may_mount()) - return -EPERM; - /* Default to relatime unless overriden */ if (!(flags & MS_NOATIME)) mnt_flags |= MNT_RELATIME; |