[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <alpine.LRH.2.00.1003021901530.1594@tundra.namei.org>
Date: Tue, 2 Mar 2010 19:02:22 +1100 (EST)
From: James Morris <jmorris@...ei.org>
To: linux-fsdevel@...r.kernel.org
cc: linux-kernel@...r.kernel.org,
linux-security-module@...r.kernel.org,
David Woodhouse <dwmw2@...radead.org>,
Joel Becker <joel.becker@...cle.com>,
Mark Fasheh <mfasheh@...e.com>, Alex Elder <aelder@....com>,
Chris Mason <chris.mason@...cle.com>,
a.gruenbacher@...puter.org
Subject: [PATCH 2/2] ocfs2: ensure trusted xattrs are not returned to
unprivileged users via listxattr
Ensure that trusted xattrs are not returned to unprivileged users
via listxattr, in keeping with several other implmentations, such
as ext3.
Signed-off-by: James Morris <jmorris@...ei.org>
---
fs/ocfs2/xattr.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c
index 8fc6fb0..da98448 100644
--- a/fs/ocfs2/xattr.c
+++ b/fs/ocfs2/xattr.c
@@ -7077,6 +7077,9 @@ static size_t ocfs2_xattr_trusted_list(struct dentry *dentry, char *list,
const size_t prefix_len = XATTR_TRUSTED_PREFIX_LEN;
const size_t total_len = prefix_len + name_len + 1;
+ if (!capable(CAP_SYS_ADMIN))
+ return 0;
+
if (list && total_len <= list_size) {
memcpy(list, XATTR_TRUSTED_PREFIX, prefix_len);
memcpy(list + prefix_len, name, name_len);
--
1.6.3.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists