| From | Greg Kroah-Hartman <> | Subject | [ 107/115] do_mount(): fix a leak introduced in 3.9 ("mount: consolidate permission checks") | Date | Mon, 6 May 2013 13:45:43 -0700 |
| |
3.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <viro@zeniv.linux.org.uk>
commit 0d5cadb87e0fa764db7fa0b78d8a6f173cb475a1 upstream.
Bisected-by: Michael Leun <lkml20130126@newton.leun.net> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- fs/namespace.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
--- a/fs/namespace.c +++ b/fs/namespace.c @@ -2238,12 +2238,11 @@ long do_mount(const char *dev_name, cons 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;
|