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

Commit c7aee394 authored by Amir Goldstein's avatar Amir Goldstein Committed by Greg Kroah-Hartman
Browse files

ovl: take mnt_want_write() for removing impure xattr 



commit a5a927a7c82e28ea76599dee4019c41e372c911f upstream.

The optimization in ovl_cache_get_impure() that tries to remove an
unneeded "impure" xattr needs to take mnt_want_write() on upper fs.

Fixes: 4edb83bb ("ovl: constant d_ino for non-merge dirs")
Signed-off-by: default avatarAmir Goldstein <amir73il@gmail.com>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e822be75

fs/overlayfs/readdir.c

+9 −2
Original line number Diff line number Diff line
@@ -575,8 +575,15 @@ static struct ovl_dir_cache *ovl_cache_get_impure(struct path *path) 
		return ERR_PTR(res);

	}

	if (list_empty(&cache->entries)) {

		/* Good oportunity to get rid of an unnecessary "impure" flag */

		ovl_do_removexattr(ovl_dentry_upper(dentry), OVL_XATTR_IMPURE);

		/*

		 * A good opportunity to get rid of an unneeded "impure" flag.

		 * Removing the "impure" xattr is best effort.

		 */

		if (!ovl_want_write(dentry)) {

			ovl_do_removexattr(ovl_dentry_upper(dentry),

					   OVL_XATTR_IMPURE);

			ovl_drop_write(dentry);

		}

		ovl_clear_flag(OVL_IMPURE, d_inode(dentry));

		kfree(cache);

		return NULL;