svn commit: r292329 - head/sys/netinet

[Alexander V. Chernikov]

Author: melifaro
Date: Wed Dec 16 09:16:06 2015
New Revision: 292329
URL: https://svnweb.freebsd.org/changeset/base/292329

Log:
  Fix ARP reply handling changed in r286955.
  
  If source of ARP request didn't pass the routing check
  (e.g. not in directly connected network), be polite and
  still answer the request instead of dropping frame.
  
  Reported by:	quadro at irc at rusnet

Modified:
  head/sys/netinet/if_ether.c

Modified: head/sys/netinet/if_ether.c
==============================================================================
--- head/sys/netinet/if_ether.c	Wed Dec 16 09:11:11 2015	(r292328)
+++ head/sys/netinet/if_ether.c	Wed Dec 16 09:16:06 2015	(r292329)
@@ -855,12 +855,20 @@ match:
 		arp_check_update_lle(ah, isaddr, ifp, bridged, la);
 	else if (itaddr.s_addr == myaddr.s_addr) {
 		/*
-		 * Reply to our address, but no lle exists yet.
-		 * do we really have to create an entry?
+		 * Request/reply to our address, but no lle exists yet.
+		 * Try to create new llentry.
 		 */
 		la = lltable_alloc_entry(LLTABLE(ifp), 0, dst);
-		if (la == NULL)
-			goto drop;
+		if (la == NULL) {
+
+			/*
+			 * lle creation may fail if source address belongs
+			 * to non-directly connected subnet. However, we
+			 * will try to answer the request instead of dropping
+			 * frame.
+			 */
+			goto reply;
+		}
 		lltable_set_entry_addr(ifp, la, ar_sha(ah));
 
 		IF_AFDATA_WLOCK(ifp);