selinux: rework match_ipv6_addrmask()

cgzones · pcmoore · commit 5e99b81f48cd · 2025-01-07T23:14:38.000-05:00
Constify parameters, add size hints, and simplify control flow.

According to godbolt the same assembly is generated.

Signed-off-by: Christian Göttsche &lt;cgzones@googlemail.com&gt;
Signed-off-by: Paul Moore &lt;paul@paul-moore.com&gt;
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
@@ -2597,17 +2597,15 @@ int security_netif_sid(char *name, u32 *if_sid)
 	return rc;
 }
 
-static int match_ipv6_addrmask(u32 *input, u32 *addr, u32 *mask)
+static bool match_ipv6_addrmask(const u32 input[4], const u32 addr[4], const u32 mask[4])
 {
-	int i, fail = 0;
+	int i;
 
 	for (i = 0; i < 4; i++)
-		if (addr[i] != (input[i] & mask[i])) {
-			fail = 1;
-			break;
-		}
+		if (addr[i] != (input[i] & mask[i]))
+			return false;
 
-	return !fail;
+	return true;
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -2597,17 +2597,15 @@ int security_netif_sid(char name, u32 if_sid)`
`2597`	`2597`	`return rc;`
`2598`	`2598`	`}`
`2599`	`2599`
`2600`		`-static int match_ipv6_addrmask(u32 input, u32 addr, u32 *mask)`
	`2600`	`+static bool match_ipv6_addrmask(const u32 input[4], const u32 addr[4], const u32 mask[4])`
`2601`	`2601`	`{`
`2602`		`- int i, fail = 0;`
	`2602`	`+ int i;`
`2603`	`2603`
`2604`	`2604`	`for (i = 0; i < 4; i++)`
`2605`		`- if (addr[i] != (input[i] & mask[i])) {`
`2606`		`- fail = 1;`
`2607`		`- break;`
`2608`		`- }`
	`2605`	`+ if (addr[i] != (input[i] & mask[i]))`
	`2606`	`+ return false;`
`2609`	`2607`
`2610`		`- return !fail;`
	`2608`	`+ return true;`
`2611`	`2609`	`}`
`2612`	`2610`
`2613`	`2611`	`/**`