summaryrefslogtreecommitdiffstats
path: root/fs/overlayfs
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@android.com>2019-08-29 11:30:14 -0700
committerMiklos Szeredi <mszeredi@redhat.com>2019-09-11 16:11:45 +0200
commit5c2e9f346b815841f9bed6029ebcb06415caf640 (patch)
tree2f2d9b40f4d7775482b5eb67173ddd6b382b5a3e /fs/overlayfs
parent97f024b9171e74c4443bbe8a8dce31b917f97ac5 (diff)
downloadlinux-stable-5c2e9f346b815841f9bed6029ebcb06415caf640.tar.gz
linux-stable-5c2e9f346b815841f9bed6029ebcb06415caf640.tar.bz2
linux-stable-5c2e9f346b815841f9bed6029ebcb06415caf640.zip
ovl: filter of trusted xattr results in audit
When filtering xattr list for reading, presence of trusted xattr results in a security audit log. However, if there is other content no errno will be set, and if there isn't, the errno will be -ENODATA and not -EPERM as is usually associated with a lack of capability. The check does not block the request to list the xattrs present. Switch to ns_capable_noaudit to reflect a more appropriate check. Signed-off-by: Mark Salyzyn <salyzyn@android.com> Cc: linux-security-module@vger.kernel.org Cc: kernel-team@android.com Cc: stable@vger.kernel.org # v3.18+ Fixes: a082c6f680da ("ovl: filter trusted xattr for non-admin") Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'fs/overlayfs')
-rw-r--r--fs/overlayfs/inode.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
index 7663aeb85fa3..bc14781886bf 100644
--- a/fs/overlayfs/inode.c
+++ b/fs/overlayfs/inode.c
@@ -383,7 +383,8 @@ static bool ovl_can_list(const char *s)
return true;
/* Never list trusted.overlay, list other trusted for superuser only */
- return !ovl_is_private_xattr(s) && capable(CAP_SYS_ADMIN);
+ return !ovl_is_private_xattr(s) &&
+ ns_capable_noaudit(&init_user_ns, CAP_SYS_ADMIN);
}
ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size)