From owner-svn-src-stable-12@freebsd.org  Sat Apr 11 09:35:49 2020
Return-Path: <owner-svn-src-stable-12@freebsd.org>
Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5AE6C2B4CC8;
 Sat, 11 Apr 2020 09:35:49 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 48zqW91myGz4PQQ;
 Sat, 11 Apr 2020 09:35:49 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 38279DF7B;
 Sat, 11 Apr 2020 09:35:49 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03B9ZnfA041164;
 Sat, 11 Apr 2020 09:35:49 GMT (envelope-from ae@FreeBSD.org)
Received: (from ae@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03B9Znlb041163;
 Sat, 11 Apr 2020 09:35:49 GMT (envelope-from ae@FreeBSD.org)
Message-Id: <202004110935.03B9Znlb041163@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org
 using -f
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Sat, 11 Apr 2020 09:35:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r359802 - stable/12/sys/netinet6
X-SVN-Group: stable-12
X-SVN-Commit-Author: ae
X-SVN-Commit-Paths: stable/12/sys/netinet6
X-SVN-Commit-Revision: 359802
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-12@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for only the 12-stable src tree
 <svn-src-stable-12.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-12>, 
 <mailto:svn-src-stable-12-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-12/>
List-Post: <mailto:svn-src-stable-12@freebsd.org>
List-Help: <mailto:svn-src-stable-12-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-12>, 
 <mailto:svn-src-stable-12-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Apr 2020 09:35:49 -0000

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,