From nobody Wed May 17 09:09:28 2023 X-Original-To: dev-commits-src-all@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 4QLnNm4fvbz4C61h; Wed, 17 May 2023 09:09:28 +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 4QLnNm47xbz3vv2; Wed, 17 May 2023 09:09:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684314568; 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=xr6S/5JEIND4fcoqiE6ggVmoa8+6SLTc9chLTbMYZWc=; b=N2NjXUBIb01BvCM2Dvew8n3kiI4+e849lADuyHNNaWmJuk0YT22ljQEAoeyXrwwXzuOHjb DjIg1noE0eNBaSyIEJ9q6D11wipwwQzVOFqbIZUXwGM1Uw61gR6f1ueIlKrPZiBPOIS60a JPDo2DVLW2dDVEEVhMkRd1gNoLSB7OHFAhBG58YJThCyqz78xTNI+VxZWCnp7QOHI6nB8F XQBfdADQtiKaIoBeltI/y6FVndD39kjzj8HzXfXrIT6xrhdZFXPfDqWkSkyGfjFcEGrHfJ fsixhsIimiBSbjj204l1RO+oyLokvqVVJub4Cu5EVbrtX3WTkbHrmf2k2yV3Pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684314568; 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=xr6S/5JEIND4fcoqiE6ggVmoa8+6SLTc9chLTbMYZWc=; b=ZL+m0i6tRfq3EicV2xy4Cg5qsG2r5mp6GzlHSIwilFmCVI4o6j/aBjnOi2Gwifq2iaMh/M E6KyiW+qD2qwB+/bgUpUIEfQLwjgem+0vTZoSEUur4WV5Muf+y5rze5OBj/4yr/5TeUL+B Q062JFx9+YRc5mmqBypBdlrEFIrIjynzkvy+9B8k2kpCG2NAEp2sWgIGxti/7JTV+F7H69 SlErlxpCk7vZPaAS8qgLVhHTcQoay7fTkZesiDk3OvsBYp+xIlAvRnCjhlvzzsp/zFb9g7 SLhtdiejkVhLocVyweET4R5i0oMJAS/qu2H9vbvb1luxaB0n4mAkfb/hbXVwIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684314568; a=rsa-sha256; cv=none; b=DXVQhkANuokausdA2PiK2Iqx3oziyKyasouB4sLckGGUeTAv2rzJiFM4Ur4XomzD754W2v jcU1E7RT05TBH+zpolMg9c4ezLcKScSbcrN1NoxbXV0StD/Hw+R2QHaHiTNxFii6nUGU3p Ox6dCpJDMkGYZu2NZWpxhabhQla9FgqHt5XPWOLcKHDoBU2k5YXr34mtTWSYsXxZVFzdh+ Cs2FnzB6Ng5JwKyOp6WByF/rCD80WfiTX0NeWdy89h+TlAM5/ejIPcPADTIkanrqIR7B/D 9uS8mRPF4yAj0O0ukp8KHKpTj5q4jg0YaNhD47VwvNqkb85vXKPz0YILr/mwdg== 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 4QLnNm361Czy5b; Wed, 17 May 2023 09:09:28 +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 34H99SBU057929; Wed, 17 May 2023 09:09:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34H99Sgn057928; Wed, 17 May 2023 09:09:28 GMT (envelope-from git) Date: Wed, 17 May 2023 09:09:28 GMT Message-Id: <202305170909.34H99Sgn057928@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: b50e1465e88d - main - routing: plug mbuf leak for the packets hitting IPv6 blackhole route List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: b50e1465e88dcf5f6f008892d802df010e7029d1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=b50e1465e88dcf5f6f008892d802df010e7029d1 commit b50e1465e88dcf5f6f008892d802df010e7029d1 Author: Alexander V. Chernikov AuthorDate: 2023-05-17 09:06:04 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-05-17 09:06:04 +0000 routing: plug mbuf leak for the packets hitting IPv6 blackhole route Reported by: Dmitriy Smirnov Tested by: Dmitriy Smirnov MFC after: 1 day --- sys/netinet6/ip6_forward.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c index c8f9079e0aa7..0f7260ccd067 100644 --- a/sys/netinet6/ip6_forward.c +++ b/sys/netinet6/ip6_forward.c @@ -198,9 +198,12 @@ again: if (nh->nh_flags & (NHF_BLACKHOLE | NHF_REJECT)) { IP6STAT_INC(ip6s_cantforward); - if ((nh->nh_flags & NHF_REJECT) && (mcopy != NULL)) { - icmp6_error(mcopy, ICMP6_DST_UNREACH, - ICMP6_DST_UNREACH_REJECT, 0); + if (mcopy != NULL) { + if (nh->nh_flags & NHF_REJECT) { + icmp6_error(mcopy, ICMP6_DST_UNREACH, + ICMP6_DST_UNREACH_REJECT, 0); + } else + m_freem(mcopy); } goto bad; }