From: Colin Ian King <colin.i.king@gmail.com>
Date: Tue, 12 Nov 2024 12:45:32 +0000 (+0000)
Subject: security: remove redundant assignment to return variable
X-Git-Tag: v6.14-rc1~166^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=241d6a66404c975415fd0facaf70d61b37248f50;p=thirdparty%2Flinux.git

security: remove redundant assignment to return variable

In the case where rc is equal to EOPNOTSUPP it is being reassigned a
new value of zero that is never read. The following continue statement
loops back to the next iteration of the lsm_for_each_hook loop and
rc is being re-assigned a new value from the call to getselfattr.
The assignment is redundant and can be removed.

Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
Reviewed-by: Serge Hallyn <serge@hallyn.com>
[PM: subj tweak]
Signed-off-by: Paul Moore <paul@paul-moore.com>
---

diff --git a/security/security.c b/security/security.c
index 7523d14f31fb1..39df4451455bc 100644
--- a/security/security.c
+++ b/security/security.c
@@ -4138,10 +4138,8 @@ int security_getselfattr(unsigned int attr, struct lsm_ctx __user *uctx,
 		if (base)
 			uctx = (struct lsm_ctx __user *)(base + total);
 		rc = scall->hl->hook.getselfattr(attr, uctx, &entrysize, flags);
-		if (rc == -EOPNOTSUPP) {
-			rc = 0;
+		if (rc == -EOPNOTSUPP)
 			continue;
-		}
 		if (rc == -E2BIG) {
 			rc = 0;
 			left = 0;