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

Commit 43b113fe authored by Richard Weinberger's avatar Richard Weinberger
Browse files

ubifs: Massage ubifs_listxattr() for encryption context 



We have to make sure that we don't expose our internal
crypto context to userspace.

Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent d475a507

fs/ubifs/xattr.c

+15 −4
Original line number Original line Diff line number Diff line
@@ -397,6 +397,20 @@ ssize_t ubifs_xattr_get(struct inode *host, const char *name, void *buf, 
	return err;

	return err;

}

}





static bool xattr_visible(const char *name)

{

	/* File encryption related xattrs are for internal use only */

	if (strcmp(name, UBIFS_XATTR_NAME_ENCRYPTION_CONTEXT) == 0)

		return false;



	/* Show trusted namespace only for "power" users */

	if (strncmp(name, XATTR_TRUSTED_PREFIX,

		    XATTR_TRUSTED_PREFIX_LEN) == 0 && !capable(CAP_SYS_ADMIN))

		return false;



	return true;

}



ssize_t ubifs_listxattr(struct dentry *dentry, char *buffer, size_t size)

ssize_t ubifs_listxattr(struct dentry *dentry, char *buffer, size_t size)

{

{

	union ubifs_key key;

	union ubifs_key key;
@@ -432,10 +446,7 @@ ssize_t ubifs_listxattr(struct dentry *dentry, char *buffer, size_t size) 
		nm.name = xent->name;

		nm.name = xent->name;

		nm.len = le16_to_cpu(xent->nlen);

		nm.len = le16_to_cpu(xent->nlen);





		/* Show trusted namespace only for "power" users */

		if (xattr_visible(xent->name)) {

		if (strncmp(xent->name, XATTR_TRUSTED_PREFIX,

			    XATTR_TRUSTED_PREFIX_LEN) ||

		    capable(CAP_SYS_ADMIN)) {

			memcpy(buffer + written, nm.name, nm.len + 1);

			memcpy(buffer + written, nm.name, nm.len + 1);

			written += nm.len + 1;

			written += nm.len + 1;

		}

		}