From nobody Fri Jan 13 21:25:18 2023 X-Original-To: dev-commits-src-branches@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 4Ntvb23hvNz2ql72; Fri, 13 Jan 2023 21:25:18 +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 4Ntvb22xCLz42F4; Fri, 13 Jan 2023 21:25:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673645118; 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=XAtgQMqtADhTfZXTOmwM14N7GlfpNJsGE9pXjy1xVbA=; b=FUlhEnrEag5ZZpUYkTQ8pFi76xDsc0qyUA6rPyKGjaAZ1EFvPrQfareORREy/HYHvUKsXy 7wAWl9wObKjiQ8UWXbYlzlmJnMPAGusaMn45MKCnrCuSJp5xmI3mWtTFnSXYUhOkVYpnw8 3T0Gwqmvr4Gh1odIMPWIzpA+3Mz50w6NuNb3cBgwUkY+egVQwKlQE5yWhvkmBuUBEumT3J b4KZmJ5ckSF6B2y/PyrK09fJmJPD7vHp9AP3Tud9quWRQvD+i3gmLz+7gLFKeKLwrvMOha iVx9xv+/NfTsvFog1L+YndtMxYCGIDML5dFSU2tQkFi9mvJKqEOmG+ts0RERuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673645118; 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=XAtgQMqtADhTfZXTOmwM14N7GlfpNJsGE9pXjy1xVbA=; b=xtg8U0O1CRRFjj+iGAQAcLHogt1XJH/r2Az86tXUlbhKa6WKWQmlL6bkpN604YLWvf2aPU 5A6io1F0vDd/Wq/W2VojTfpds0eqjhm4bc2CaZ/L9zKxAcEHOQMuncKp+EpyHSuDB2Y5zr 4apJWGr4npMY9J9u3zJRVO8HajDcgL5LECHBj4OYE9hJhu5S5dSRc6j66IjhBh+n4loJ/N 58e1K7ewoGSOl/hZ2gkiSjgsdl2JGHV2BCpqwjd0d089Fkjncz+bBQcvmLbJpmV0ogcFR5 ZRQnTrVMvncKR9ly7Pfvpy4mza79RRb4pseHxJdT+OKfvz/9zuh6p1ht1djDNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673645118; a=rsa-sha256; cv=none; b=XssG1VddfZN61zCmFfBFDO8UWpHnusybTvDyJHCfRIQjm7pSNOvIMnGlaNbn3N/Si/fKxw p2w2uPVUL9a2H6a/vWxCc3p0cOIcPElvU9+c9AWoRjawvuYydfI+4qgjIn1As6Q1uu8xa2 HCrlXI8jVD1mVZNL1HTYdEsMGdyiLZRB4YCEOzEwWfE8G+53GGdc55B/BXnvkguVMhdx1/ rr4Y2rvOmEM2JSP3cQFwY/vRmiNWrpshxSVWIgkzMZY5QArCu1VQ0/otTlLBICs7l5O2Zx DzDCfFwhKcPYxu7eTMvdD+K1iudxIN8ateXPrm51uN0qrLUBPZwRszVOuoFf/Q== 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 4Ntvb21ShdzN2K; Fri, 13 Jan 2023 21:25:18 +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 30DLPIVM041651; Fri, 13 Jan 2023 21:25:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30DLPIiC041650; Fri, 13 Jan 2023 21:25:18 GMT (envelope-from git) Date: Fri, 13 Jan 2023 21:25:18 GMT Message-Id: <202301132125.30DLPIiC041650@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: fc850f4f7d44 - stable/13 - netinet6: perform out-of-bounds check for loX multicast statistics List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: fc850f4f7d44201210750329eeb5ca35dd04b58c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=fc850f4f7d44201210750329eeb5ca35dd04b58c commit fc850f4f7d44201210750329eeb5ca35dd04b58c Author: Alexander V. Chernikov AuthorDate: 2022-07-04 20:03:06 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-01-13 21:24:10 +0000 netinet6: perform out-of-bounds check for loX multicast statistics Currently, some per-mbuf multicast statistics is stored in the per-interface ip6stat.ip6s_m2m[] array of size 32 (IP6S_M2MMAX). Check that loopback ifindex falls within 0.. IP6S_M2MMAX-1 range to avoid silent data corruption. The latter cat happen with large number of VNETs. Reviewed by: glebius Differential Revision: https://reviews.freebsd.org/D35715 MFC after: 2 weeks (cherry picked from commit 0ed72537857bfb6ac6d19b0852a52288db79b8b0) --- sys/netinet6/ip6_input.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index 30ad9a53006a..2423b61e0b36 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -579,12 +579,11 @@ ip6_input(struct mbuf *m) IP6STAT_INC(ip6s_mext1); } else { if (m->m_next) { - if (m->m_flags & M_LOOP) { - IP6STAT_INC(ip6s_m2m[V_loif->if_index]); - } else if (rcvif->if_index < IP6S_M2MMAX) - IP6STAT_INC(ip6s_m2m[rcvif->if_index]); - else - IP6STAT_INC(ip6s_m2m[0]); + struct ifnet *ifp = (m->m_flags & M_LOOP) ? V_loif : rcvif; + int ifindex = ifp->if_index; + if (ifindex >= IP6S_M2MMAX) + ifindex = 0; + IP6STAT_INC(ip6s_m2m[ifindex]); } else IP6STAT_INC(ip6s_m1); }