From nobody Sun Jan 15 15:23:02 2023 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 4NvzS70ZPhz2t8mQ; Sun, 15 Jan 2023 15:23:03 +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 4NvzS700wnz4kqM; Sun, 15 Jan 2023 15:23:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673796183; 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=lEQvvJvpFCn13lRAw38kv2C0uZP317YobbpBwmFtCig=; b=rNBaOngV41Sz3gaPMdJBvHUpBcs84mFV+0PECjzQmHfbSeYF9jDEGuMoO/rGJSphSVFJtr X+kY9XxrbLuRioroIZb14Tc0TtvJ3TzFY8++JBPz9Nh7dTiPKNGU2tATfMx/QTD1Mcdi2B dxpD9Ng10QPoTxHMZee7ukNPH+ySVepoxHjz4r+SazUou35hOVRb+9B5TaE3lwl/2PtTUT 2TgnFJ8LbMs+ODJXUk0QIhm4QiXpWbu6wL1+zwZ9h1Gj4awsLcm4Is5RmeKM8KlCpd9uWy kiL8CQulS1tLQtCk52ArbGWuNDn/ZPGvlRD2oqiuwUYC8t3VrYCdJS/c0693Kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673796183; 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=lEQvvJvpFCn13lRAw38kv2C0uZP317YobbpBwmFtCig=; b=LRE0TA4ivfmFnVDDqN4+C21trlNKV+DyViIMY+EmafWuNhtpzi3ndaDQL81z/Hq1MswKVp e3m3QSG0bKHQISxLw57HoFERDD4dcYh0rpYUNC78v2LKCRXk69ADfx3osOW3KmM+LKiwwp 0JDlu/lIeLWL5fvbLUQPj5gHwewk5dUZYnp6iSCsYYrdlGMSzCaL9S/psQbf8oNK3CZR6B 247bJ+rGE4MeB+kvpT21RLYgMC956C7dfBfkXOrp7togUwOO7Y4lacOFtR9ZQJKw2Xl3AJ M6aZCem9er+/ydaeClm+SssaymHX/8y3oAkBOIeUUoCTbj7291CSzvcMl5hLmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673796183; a=rsa-sha256; cv=none; b=OeYEJ3IZY7Q2RBEsUcTvAspRrurIyDN775G1ISTmOBbcM1rF+vrunFXel3DNO17JzI9aJs GN7kI4wX7XnP/tJGyOrY1I4w9/SvrW78uZxiQ278bZ7QRt7pOuQlH022+YHrwrlJvuEoRP m0O3q6unYF1DB7jp206CofslG2rgS8t//GtdPlQ/ttAMIbiZpysEs5ITyXoouvEaPjOoIx CyAaQNYiopWTThowM72F4WNYAO8LmY8koNr9sSsv7yOXpio818IvD3XL84GqceT9SZRwzb 4sdkKH6mHg8ewm8M4aeMWfYFm0s9wjW++74EMZE/67EUqI7WTGRMbyLRGmm5gA== 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 4NvzS669pFzWwL; Sun, 15 Jan 2023 15:23:02 +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 30FFN2vx056971; Sun, 15 Jan 2023 15:23:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30FFN2jp056970; Sun, 15 Jan 2023 15:23:02 GMT (envelope-from git) Date: Sun, 15 Jan 2023 15:23:02 GMT Message-Id: <202301151523.30FFN2jp056970@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 6468b6b23e08 - main - nd6: fix panic in lltable_drop_entry_queue() 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6468b6b23e08d9bd02c8cb74ec0ff389ed74c3bb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=6468b6b23e08d9bd02c8cb74ec0ff389ed74c3bb commit 6468b6b23e08d9bd02c8cb74ec0ff389ed74c3bb Author: Alexander V. Chernikov AuthorDate: 2023-01-15 15:10:48 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-01-15 15:22:42 +0000 nd6: fix panic in lltable_drop_entry_queue() nd6_resolve_slow() can be called without mbuf. If the LLE entry is not reachable, nd6_resolve_slow() will add this NULL mbuf to the holdchain via lltable_append_entry_queue, which will "append" NULL to the end of the queue (effectively no-op) and bump la_numhold value. When this entry gets freed, the kernel will panic due to the inconsistency between the amount of mbufs in the queue and the value of la_numhold. Fix the panic by checking of mbuf is not NULL prior to inserting it into the holdchain. Reported by: kib MFC after: 3 days --- sys/netinet6/nd6.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index be881b6291ac..de35127bd17d 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -2369,7 +2369,6 @@ nd6_resolve_slow(struct ifnet *ifp, int family, int flags, struct mbuf *m, struct in6_addr *psrc, src; int send_ns, ll_len; char *lladdr; - size_t dropped; NET_EPOCH_ASSERT(); @@ -2436,8 +2435,12 @@ nd6_resolve_slow(struct ifnet *ifp, int family, int flags, struct mbuf *m, * packet queue in the mbuf. When it exceeds nd6_maxqueuelen, * the oldest packet in the queue will be removed. */ - dropped = lltable_append_entry_queue(lle, m, V_nd6_maxqueuelen); - ICMP6STAT_ADD(icp6s_dropped, dropped); + if (m != NULL) { + size_t dropped; + + dropped = lltable_append_entry_queue(lle, m, V_nd6_maxqueuelen); + ICMP6STAT_ADD(icp6s_dropped, dropped); + } /* * If there has been no NS for the neighbor after entering the