From nobody Mon Oct 17 18:40:42 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Mrm5k4L7Vz4f8MK; Mon, 17 Oct 2022 18:40:42 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mrm5k3p1Cz3r7K; Mon, 17 Oct 2022 18:40:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666032042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qj/1AEwBH0uqvxkgHdiYcKXvVMsS6u5jrIg4RQzMiMY=; b=iXsnmZ91CdMOk/UKhko25MHOyRYsYzc6dkdtX14pYIBhnDDUmC1bth59QAQfTGVFkt1nfY DGEpYgUBR2tccmBc9qejADIZo543EantJjKVLsUOM5yI4siX8zjo+JMdoRqOYhG2eOcwu6 BfAvj2cyPhlSoPmz4SnYkzho0/1794xv2WLmtUL9DUFkrMi8yQQNCji3Px98pbLI6qrbcf cFPjlO+NrYeV0kB5mCdVSvqvgUefn5KT9C3qC8CdpTrzdhulY8nrwwLPPUt7C/Wj3lI/Mt hR/FA6szTFeokAPBX51P0RUDqijN2JFXxaM+aAZBZYmXIT8jYy+L7tac4nHU1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Mrm5k2rdSzvnQ; Mon, 17 Oct 2022 18:40:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29HIegWW042728; Mon, 17 Oct 2022 18:40:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29HIeguH042727; Mon, 17 Oct 2022 18:40:42 GMT (envelope-from git) Date: Mon, 17 Oct 2022 18:40:42 GMT Message-Id: <202210171840.29HIeguH042727@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: a3da8329c509 - main - carp: fix regression panic from ccd69bd573f List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a3da8329c509a002908602175cd7507fc10d4f6c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666032042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qj/1AEwBH0uqvxkgHdiYcKXvVMsS6u5jrIg4RQzMiMY=; b=ElkTPDdQlydUrtbt6KGjP6L0sSro0+CXvexDW0ZamNhUpkg4C8+CLAf1u0wSX0BtEqQ3Sy H3Y6vQfR/fysqoBRzbEdDgVFB9XkxZ1rpbi87gObYsSwHQ9t1fZ27jYFVLgSJAyEpz3+/f toR4gzrckapHbuvLxhP2nZCjRuIuxQtfrwdBwsDTS5cMnz+VjEKHqpBoaMJvKUP6B65VqY o/rTOgMswA7CJ75sgyDe2QaQif6MUlhR8Pf1V8PPFUn8VSMjbJcJ0JilYJZJAMKEROt9lA GFN3jT2v9V710K/96YvQGCNkbPoB9HnSjqktkjPH68ToS8lyAF40kJpvUi7Apg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666032042; a=rsa-sha256; cv=none; b=CI+61SE1RQ4eyZn1bh1aPzbReRijpIo/C2Sq8RnTK4FudMh2kKISkHCKj/4xl71FsAee7A H6pv9+mSzo71tmXmJrGNpbohgy5MFcnMEjQBcCFmYSqn4q4ITT0BWfoxn/tWLiQQgeVaNe 8IP6kXsRuzBriH/5nrNsEVnw8B8hevhtBPF6z0tLIjgwXN+3I7Ymhj9TH2LfyGtFAUb3BA 1hyqx3WbdZgZwYjXT4/X7aF5bgZMb8hW19p81l2k2phWWPBHskKvu+r+O4DGkzMWcUYmRs CJbirE3OP5ttcP32q1U8u0SkiZpOROp+Yey4PaGyumD2z4Ik8wDPejl8zaTvEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=a3da8329c509a002908602175cd7507fc10d4f6c commit a3da8329c509a002908602175cd7507fc10d4f6c Author: Gleb Smirnoff AuthorDate: 2022-10-17 18:39:40 +0000 Commit: Gleb Smirnoff CommitDate: 2022-10-17 18:39:40 +0000 carp: fix regression panic from ccd69bd573f Reported & tested by: Oleg Ginzburg Fixes: ccd69bd573f185308e7652190ff64b50f7fba381 --- sys/netinet6/nd6_nbr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index 7bca7fa59ac7..cd7119c9ccbc 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -514,7 +514,8 @@ nd6_ns_output_fib(struct ifnet *ifp, const struct in6_addr *saddr6, * Do not send NS for CARP address if we are not * the CARP master. */ - if (ifa != NULL && !(*carp_master_p)(ifa)) { + if (ifa != NULL && ifa->ifa_carp != NULL && + !(*carp_master_p)(ifa)) { log(LOG_DEBUG, "nd6_ns_output: NS from BACKUP CARP address %s\n", ip6_sprintf(ip6buf, &ip6->ip6_src));