aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruenba@redhat.com>2015-10-04 19:18:50 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2015-11-13 20:34:30 -0500
commitbf781714b3e1421a0ebcd0137d081e6566a89f15 (patch)
tree63c53e010b663b46a3eb9db757ce8da0fac75bf3
parenthfsplus: Remove unused xattr handler list operations (diff)
downloadlinux-dev-bf781714b3e1421a0ebcd0137d081e6566a89f15.tar.xz
linux-dev-bf781714b3e1421a0ebcd0137d081e6566a89f15.zip
jffs2: Add missing capability check for listing trusted xattrs
The vfs checks if a task has the appropriate access for get and set operations, but it cannot do that for the list operation; the file system must check for that itself. Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Cc: David Woodhouse <dwmw2@infradead.org> Cc: linux-mtd@lists.infradead.org Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/jffs2/xattr_trusted.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/jffs2/xattr_trusted.c b/fs/jffs2/xattr_trusted.c
index ceaf9c693225..bbd20c16090e 100644
--- a/fs/jffs2/xattr_trusted.c
+++ b/fs/jffs2/xattr_trusted.c
@@ -39,6 +39,9 @@ static size_t jffs2_trusted_listxattr(struct dentry *dentry, char *list,
{
size_t retlen = XATTR_TRUSTED_PREFIX_LEN + name_len + 1;
+ if (!capable(CAP_SYS_ADMIN))
+ return 0;
+
if (list && retlen<=list_size) {
strcpy(list, XATTR_TRUSTED_PREFIX);
strcpy(list + XATTR_TRUSTED_PREFIX_LEN, name);