From: Dmitry Mastykin <dmastykin@astralinux.ru>
To: unlisted-recipients:; (no To-header on input)
Cc: dmastykin@astralinux.ru, Serge Hallyn <serge@hallyn.com>,
James Morris <jmorris@namei.org>,
linux-security-module@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] commoncap: Make cap_inode_killpriv ignore other LSM xattr
Date: Fri, 22 May 2020 14:32:25 +0300 [thread overview]
Message-ID: <20200522113225.29980-1-dmastykin@astralinux.ru> (raw)
Other LSM may set own capabilities to files. But its inode_killpriv
hook may not be called because cap_inode_killpriv breaks
the chain returning -ENODATA on remove xattr other than
XATTR_NAME_CAPS.
Signed-off-by: Dmitry Mastykin <dmastykin@astralinux.ru>
---
security/commoncap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/security/commoncap.c b/security/commoncap.c
index f4ee0ae106b2..0c12ecf5676f 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -314,7 +314,7 @@ int cap_inode_killpriv(struct dentry *dentry)
int error;
error = __vfs_removexattr(dentry, XATTR_NAME_CAPS);
- if (error == -EOPNOTSUPP)
+ if (error == -ENODATA || error == -EOPNOTSUPP)
error = 0;
return error;
}
--
2.23.0
reply other threads:[~2020-05-22 12:33 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200522113225.29980-1-dmastykin@astralinux.ru \
--to=dmastykin@astralinux.ru \
--cc=jmorris@namei.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=serge@hallyn.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).