aboutsummaryrefslogtreecommitdiff
path: root/include/linux/security.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-12-10 16:01:47 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2020-12-10 16:01:47 -0800
commit197c61cb176a40f5877c3caf8249722e77b7d989 (patch)
tree4cb31709e4f1614ac89dcb71c3ba8da223449b34 /include/linux/security.h
parent6840a3dcc2447188e7bb8464b31a7620bc4423ee (diff)
parented9b25d1970a4787ac6a39c2091e63b127ecbfc1 (diff)
downloadlinux-197c61cb176a40f5877c3caf8249722e77b7d989.tar.gz
Merge tag 'fixes-v5.10a' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull namespaced fscaps fix from James Morris: "Fix namespaced fscaps when !CONFIG_SECURITY (Serge Hallyn)" * tag 'fixes-v5.10a' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: [SECURITY] fix namespaced fscaps when !CONFIG_SECURITY
Diffstat (limited to 'include/linux/security.h')
-rw-r--r--include/linux/security.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/security.h b/include/linux/security.h
index bc2725491560..39642626a707 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -869,7 +869,7 @@ static inline int security_inode_killpriv(struct dentry *dentry)
static inline int security_inode_getsecurity(struct inode *inode, const char *name, void **buffer, bool alloc)
{
- return -EOPNOTSUPP;
+ return cap_inode_getsecurity(inode, name, buffer, alloc);
}
static inline int security_inode_setsecurity(struct inode *inode, const char *name, const void *value, size_t size, int flags)