From 42661f7ba106b7d2e02f85a65880061585ca6ccb Mon Sep 17 00:00:00 2001 From: Sebastien Buisson Date: Tue, 9 Nov 2021 17:03:19 +0100 Subject: [PATCH] LU-15184 llite: properly detect SELinux disabled case Usually, security_dentry_init_security() returns -EOPNOTSUPP when SELinux is disabled. But on some kernels (e.g. rhel 8.5) it returns 0 when SELinux is disabled, and in this case the security context is empty. So in both cases make sure the security context name is not set, which means "SELinux is disabled" for the rest of the code. Signed-off-by: Sebastien Buisson Change-Id: I3b9608f9768288de89570c158e8429560fa0213f Reviewed-on: https://review.whamcloud.com/45501 Reviewed-by: Jian Yu Reviewed-by: Shaun Tancheff Tested-by: jenkins Reviewed-by: John L. Hammond Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/llite/xattr_security.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lustre/llite/xattr_security.c b/lustre/llite/xattr_security.c index 94679b8..3993700 100644 --- a/lustre/llite/xattr_security.c +++ b/lustre/llite/xattr_security.c @@ -75,7 +75,13 @@ int ll_dentry_init_security(struct dentry *dentry, int mode, struct qstr *name, rc = security_dentry_init_security(dentry, mode, name, secctx, secctx_size); - if (rc == -EOPNOTSUPP) + /* Usually, security_dentry_init_security() returns -EOPNOTSUPP when + * SELinux is disabled. + * But on some kernels (e.g. rhel 8.5) it returns 0 when SELinux is + * disabled, and in this case the security context is empty. + */ + if (rc == -EOPNOTSUPP || (rc == 0 && *secctx_size == 0)) + /* do nothing */ return 0; if (rc < 0) return rc; -- 1.8.3.1