Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d5cadb8 authored by Al Viro's avatar Al Viro
Browse files

do_mount(): fix a leak introduced in 3.9 ("mount: consolidate permission checks") 



Cc: stable@vger.kernel.org
Bisected-by: default avatarMichael Leun <lkml20130126@newton.leun.net>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 0279b3c0

fs/namespace.c

+2 −3
Original line number Diff line number Diff line
@@ -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;