From: Paul Moore <paul@paul-moore.com>
Date: Tue, 24 Oct 2023 16:42:38 +0000 (-0400)
Subject: lsm: correct error codes in security_getselfattr()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fdcf699b60712ecd6e41d9fc09137279257a4bf8;p=linux.git

lsm: correct error codes in security_getselfattr()

We should return -EINVAL if the user specifies LSM_FLAG_SINGLE without
supplying a valid lsm_ctx struct buffer.

Acked-by: Casey Schaufler <casey@schaufler-ca.com>
Reviewed-by: Mickaël Salaün <mic@digikod.net>
Signed-off-by: Paul Moore <paul@paul-moore.com>
---

diff --git a/security/security.c b/security/security.c
index 74ff9a48bd66d..78e7ffcc9f6cd 100644
--- a/security/security.c
+++ b/security/security.c
@@ -3922,9 +3922,9 @@ int security_getselfattr(unsigned int attr, struct lsm_ctx __user *uctx,
 		/*
 		 * Only flag supported is LSM_FLAG_SINGLE
 		 */
-		if (flags != LSM_FLAG_SINGLE)
+		if (flags != LSM_FLAG_SINGLE || !uctx)
 			return -EINVAL;
-		if (uctx && copy_from_user(&lctx, uctx, sizeof(lctx)))
+		if (copy_from_user(&lctx, uctx, sizeof(lctx)))
 			return -EFAULT;
 		/*
 		 * If the LSM ID isn't specified it is an error.