Merge tag 'fixes-v5.10a' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

torvalds · torvalds · commit 197c61cb176a · 2020-12-10T16:01:47.000-08:00
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
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -869,7 +869,7 @@ static inline int security_inode_killpriv(struct dentry *dentry)`
`869`	`869`
`870`	`870`	`static inline int security_inode_getsecurity(struct inode inode, const char name, void **buffer, bool alloc)`
`871`	`871`	`{`
`872`		`- return -EOPNOTSUPP;`
	`872`	`+ return cap_inode_getsecurity(inode, name, buffer, alloc);`
`873`	`873`	`}`
`874`	`874`
`875`	`875`	`static inline int security_inode_setsecurity(struct inode inode, const char name, const void *value, size_t size, int flags)`