[rh7,v2] commoncap: relax setxattr and removxattr checks

Submitted by Andrey Zhadchenko on Nov. 16, 2020, 11:39 a.m.

Details

Message ID 1605526752-777706-1-git-send-email-andrey.zhadchenko@virtuozzo.com
State New
Series "commoncap: relax setxattr and removexattr checks"
Headers show

Commit Message

Andrey Zhadchenko Nov. 16, 2020, 11:39 a.m.
Allow user to set security xattr (XATTR_SECURITY_PREFIX) from the inside
of ve on external mounts (for example, root).

https://jira.sw.ru/browse/PSBM-122071
Signed-off-by: Andrey Zhadchenko <andrey.zhadchenko@virtuozzo.com>
---
 security/commoncap.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

v2: omit #ifdef CONFIG_VE since ve_capable is defined for that case.

Patch hide | download patch | download mbox

diff --git a/security/commoncap.c b/security/commoncap.c
index 6ce7b51..98d6a10 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -912,7 +912,8 @@  int cap_inode_setxattr(struct dentry *dentry, const char *name,
 		return 0;
 
 	if (!ns_capable(user_ns, CAP_SYS_ADMIN))
-		return -EPERM;
+		if (!ve_capable(CAP_SYS_ADMIN))
+			return -EPERM;
 	return 0;
 }
 
@@ -947,7 +948,8 @@  int cap_inode_removexattr(struct dentry *dentry, const char *name)
 	}
 
 	if (!ns_capable(user_ns, CAP_SYS_ADMIN))
-		return -EPERM;
+		if (!ve_capable(CAP_SYS_ADMIN))
+			return -EPERM;
 	return 0;
 }