Patchwork [U-Boot] net: Correct check for link-local target IP conflict

login
register
mail settings
Submitter Joe Hershberger
Date Feb. 8, 2013, 8:18 p.m.
Message ID <1360354733-914-1-git-send-email-joe.hershberger@ni.com>
Download mbox | patch
Permalink /patch/219298/
State Accepted
Delegated to: Joe Hershberger
Headers show

Comments

Joe Hershberger - Feb. 8, 2013, 8:18 p.m.
Make the link-local code conform more completely with the RFC.

This will prevent ARP queries for the target (such as while it is
rebooting) from causing the device to choose a different link-local
address, thinking that its address is in use by another machine.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---
 net/link_local.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
Joe Hershberger - July 8, 2013, 4:07 p.m.
On Fri, Feb 8, 2013 at 2:18 PM, Joe Hershberger <joe.hershberger@ni.com> wrote:
> Make the link-local code conform more completely with the RFC.
>
> This will prevent ARP queries for the target (such as while it is
> rebooting) from causing the device to choose a different link-local
> address, thinking that its address is in use by another machine.
>
> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>

Applied, Thanks.
-Joe

Patch

diff --git a/net/link_local.c b/net/link_local.c
index 1ba796e..9a887d8 100644
--- a/net/link_local.c
+++ b/net/link_local.c
@@ -206,6 +206,7 @@  void link_local_receive_arp(struct arp_hdr *arp, int len)
 {
 	int source_ip_conflict;
 	int target_ip_conflict;
+	IPaddr_t null_ip = 0;
 
 	if (state == DISABLED)
 		return;
@@ -267,9 +268,18 @@  void link_local_receive_arp(struct arp_hdr *arp, int len)
 	) {
 		source_ip_conflict = 1;
 	}
+
+	/*
+	 * According to RFC 3927, section 2.2.1:
+	 * Check if packet is an ARP probe by checking for a null source IP
+	 * then check that target IP is equal to ours and source hw addr
+	 * is not equal to ours. This condition should cause a conflict only
+	 * during probe.
+	 */
 	if (arp->ar_op == htons(ARPOP_REQUEST)
+	 && memcmp(&arp->ar_spa, &null_ip, ARP_PLEN) == 0
 	 && memcmp(&arp->ar_tpa, &ip, ARP_PLEN) == 0
-	 && memcmp(&arp->ar_tha, NetOurEther, ARP_HLEN) != 0
+	 && memcmp(&arp->ar_sha, NetOurEther, ARP_HLEN) != 0
 	) {
 		target_ip_conflict = 1;
 	}