diff options
| author | Mark Salyzyn <salyzyn@android.com> | 2019-08-29 11:30:14 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-05 12:48:09 +0200 |
| commit | 8a19d2b1e84c35f19c3f96c9d29b4de8713aaa97 (patch) | |
| tree | 7ef7d91b56bf3c2df3aedb6ee245cb0315a40d79 | |
| parent | d89b50bc86cb5a17a12529a9d14522f1db0f6c5f (diff) | |
| download | linux-stable-8a19d2b1e84c35f19c3f96c9d29b4de8713aaa97.tar.gz linux-stable-8a19d2b1e84c35f19c3f96c9d29b4de8713aaa97.tar.bz2 linux-stable-8a19d2b1e84c35f19c3f96c9d29b4de8713aaa97.zip | |
ovl: filter of trusted xattr results in audit
commit 5c2e9f346b815841f9bed6029ebcb06415caf640 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | fs/overlayfs/inode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c index efed50304b49..30a1c7fc8c75 100644 --- a/fs/overlayfs/inode.c +++ b/fs/overlayfs/inode.c @@ -265,7 +265,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) |