svn commit: r359802 - stable/12/sys/netinet6

[Andrey V. Elsukov]

Author: ae
Date: Sat Apr 11 09:35:48 2020
New Revision: 359802
URL: https://svnweb.freebsd.org/changeset/base/359802

Log:
  MFC r359498:
    Ignore ND6 neighbor advertisement received for static link-layer entries.
  
    Previously such NA could override manually created LLE.
  
    Reported by:	Martin Beran <martin at mber cz>

Modified:
  stable/12/sys/netinet6/nd6_nbr.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/netinet6/nd6_nbr.c
==============================================================================
--- stable/12/sys/netinet6/nd6_nbr.c	Sat Apr 11 08:16:35 2020	(r359801)
+++ stable/12/sys/netinet6/nd6_nbr.c	Sat Apr 11 09:35:48 2020	(r359802)
@@ -753,6 +753,12 @@ nd6_na_input(struct mbuf *m, int off, int icmp6len)
 		goto freeit;
 	}
 
+	/*
+	 * Do not try to override static entry.
+	 */
+	if (ln->la_flags & LLE_STATIC)
+		goto freeit;
+
 	if (ln->ln_state == ND6_LLINFO_INCOMPLETE) {
 		/*
 		 * If the link-layer has address, and no lladdr option came,