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

Commit a082c6f6 authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

ovl: filter trusted xattr for non-admin 



Filesystems filter out extended attributes in the "trusted." domain for
unprivlieged callers.

Overlay calls underlying filesystem's method with elevated privs, so need
to do the filtering in overlayfs too.

Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent f3a15685

fs/overlayfs/inode.c

+11 −1
Original line number Diff line number Diff line
@@ -240,6 +240,16 @@ int ovl_xattr_get(struct dentry *dentry, const char *name, 
	return res;

}



static bool ovl_can_list(const char *s)

{

	/* List all non-trusted xatts */

	if (strncmp(s, XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN) != 0)

		return true;



	/* Never list trusted.overlay, list other trusted for superuser only */

	return !ovl_is_private_xattr(s) && capable(CAP_SYS_ADMIN);

}



ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size)

{

	struct dentry *realdentry = ovl_dentry_real(dentry);
@@ -263,7 +273,7 @@ ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size) 
			return -EIO;



		len -= slen;

		if (ovl_is_private_xattr(s)) {

		if (!ovl_can_list(s)) {

			res -= slen;

			memmove(s, s + slen, len);

		} else {