Skip to content

net: ipv4: Fix ARP probe check in address conflict detection #80433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 29, 2024
Merged

net: ipv4: Fix ARP probe check in address conflict detection #80433

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions subsys/net/ip/ipv4_acd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,16 +288,19 @@
ll_addr = net_if_get_link_addr(addr_iface);

/* RFC 5227, ch. 2.1.1 Probe Details:
* - Sender IP address match OR,
* - Target IP address match with different sender HW address,
* - ARP Request/Reply with Sender IP address match OR,
* - ARP Probe where Target IP address match with different sender HW address,
* indicate a conflict.
* ARP Probe has an all-zero sender IP address
*/
if (net_ipv4_addr_cmp_raw(arp_hdr->src_ipaddr,
(uint8_t *)&ifaddr->address.in_addr) ||
(net_ipv4_addr_cmp_raw(arp_hdr->dst_ipaddr,
(uint8_t *)&ifaddr->address.in_addr) &&
memcmp(&arp_hdr->src_hwaddr, ll_addr->addr, ll_addr->len) != 0)) {
(memcmp(&arp_hdr->src_hwaddr, ll_addr->addr, ll_addr->len) != 0) &&
(net_ipv4_addr_cmp_raw(arp_hdr->src_ipaddr,
(uint8_t *)&(struct in_addr)INADDR_ANY_INIT)))) {
NET_DBG("Conflict detected from %s for %s",

Check notice on line 303 in subsys/net/ip/ipv4_acd.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

subsys/net/ip/ipv4_acd.c:303 
-					  (uint8_t *)&ifaddr->address.in_addr) &&
-				 (memcmp(&arp_hdr->src_hwaddr, ll_addr->addr, ll_addr->len) != 0) &&
-				 (net_ipv4_addr_cmp_raw(arp_hdr->src_ipaddr,
-						(uint8_t *)&(struct in_addr)INADDR_ANY_INIT)))) {
+					   (uint8_t *)&ifaddr->address.in_addr) &&
+		     (memcmp(&arp_hdr->src_hwaddr, ll_addr->addr, ll_addr->len) != 0) &&
+		     (net_ipv4_addr_cmp_raw(arp_hdr->src_ipaddr,
+					    (uint8_t *)&(struct in_addr)INADDR_ANY_INIT)))) {

Check notice on line 303 in subsys/net/ip/ipv4_acd.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

subsys/net/ip/ipv4_acd.c:303 
-					  (uint8_t *)&ifaddr->address.in_addr) &&
-				 (memcmp(&arp_hdr->src_hwaddr, ll_addr->addr, ll_addr->len) != 0) &&
-				 (net_ipv4_addr_cmp_raw(arp_hdr->src_ipaddr,
-						(uint8_t *)&(struct in_addr)INADDR_ANY_INIT)))) {
+					   (uint8_t *)&ifaddr->address.in_addr) &&
+		     (memcmp(&arp_hdr->src_hwaddr, ll_addr->addr, ll_addr->len) != 0) &&
+		     (net_ipv4_addr_cmp_raw(arp_hdr->src_ipaddr,
+					    (uint8_t *)&(struct in_addr)INADDR_ANY_INIT)))) {

Check notice on line 303 in subsys/net/ip/ipv4_acd.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

subsys/net/ip/ipv4_acd.c:303 
-					  (uint8_t *)&ifaddr->address.in_addr) &&
-				 (memcmp(&arp_hdr->src_hwaddr, ll_addr->addr, ll_addr->len) != 0) &&
-				 (net_ipv4_addr_cmp_raw(arp_hdr->src_ipaddr,
-						(uint8_t *)&(struct in_addr)INADDR_ANY_INIT)))) {
+					   (uint8_t *)&ifaddr->address.in_addr) &&
+		     (memcmp(&arp_hdr->src_hwaddr, ll_addr->addr, ll_addr->len) != 0) &&
+		     (net_ipv4_addr_cmp_raw(arp_hdr->src_ipaddr,
+					    (uint8_t *)&(struct in_addr)INADDR_ANY_INIT)))) {
net_sprint_ll_addr((uint8_t *)&arp_hdr->src_hwaddr,
arp_hdr->hwlen),
net_sprint_ipv4_addr(&ifaddr->address.in_addr));
Expand Down
Loading