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>

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;