net: ipv6: Fix net_ipv6_is_addr_mcast_group() check

rlubos · danieldegrasse · commit 9b00a1d6569f · 2025-07-04T13:16:32.000-05:00
Some bytes were compared twice and one comparison used wrong index.

Signed-off-by: Robert Lubos &lt;robert.lubos@nordicsemi.no&gt;
diff --git a/include/zephyr/net/net_ip.h b/include/zephyr/net/net_ip.h
@@ -1299,10 +1299,8 @@ static inline bool net_ipv6_is_addr_mcast_group(const struct in6_addr *addr,
 						const struct in6_addr *group)
 {
 	return UNALIGNED_GET(&addr->s6_addr16[1]) == group->s6_addr16[1] &&
-		UNALIGNED_GET(&addr->s6_addr16[2]) == group->s6_addr16[2] &&
-		UNALIGNED_GET(&addr->s6_addr16[3]) == group->s6_addr16[3] &&
 		UNALIGNED_GET(&addr->s6_addr32[1]) == group->s6_addr32[1] &&
-		UNALIGNED_GET(&addr->s6_addr32[2]) == group->s6_addr32[1] &&
+		UNALIGNED_GET(&addr->s6_addr32[2]) == group->s6_addr32[2] &&
 		UNALIGNED_GET(&addr->s6_addr32[3]) == group->s6_addr32[3];
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1299,10 +1299,8 @@ static inline bool net_ipv6_is_addr_mcast_group(const struct in6_addr *addr,`
`1299`	`1299`	`const struct in6_addr *group)`
`1300`	`1300`	`{`
`1301`	`1301`	`return UNALIGNED_GET(&addr->s6_addr16[1]) == group->s6_addr16[1] &&`
`1302`		`- UNALIGNED_GET(&addr->s6_addr16[2]) == group->s6_addr16[2] &&`
`1303`		`- UNALIGNED_GET(&addr->s6_addr16[3]) == group->s6_addr16[3] &&`
`1304`	`1302`	`UNALIGNED_GET(&addr->s6_addr32[1]) == group->s6_addr32[1] &&`
`1305`		`- UNALIGNED_GET(&addr->s6_addr32[2]) == group->s6_addr32[1] &&`
	`1303`	`+ UNALIGNED_GET(&addr->s6_addr32[2]) == group->s6_addr32[2] &&`
`1306`	`1304`	`UNALIGNED_GET(&addr->s6_addr32[3]) == group->s6_addr32[3];`
`1307`	`1305`	`}`
`1308`	`1306`