From nobody Tue Aug 1 20:06:26 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 4RFmMl3Bm1z4pnpj; Tue, 1 Aug 2023 20:06:27 +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 4RFmMk5FWvz3Gm4; Tue, 1 Aug 2023 20:06:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920386; 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=Waf+I+28o+oPnsNb9fHwK6Z+sdHWZV/Psdkl97a0Lx0=; b=Ch/zCXRX3ScYytlQTOneCan8MctYGjZHMyq7UGjen7Mgy+OchGjZ/xD+OEbAZv27jmwqTI uY8Wujykjt8nFAZw1VhzHRK30rgZOv5E1Rc9uuxrxTr9U3rtB0kVhNnz7CrkBMNmrP+2Um ndrNByC5Ixv+cr3Vi1wUjE9ew7zEv4ILqCuMwexuuypPW9+CvQPZwxqLk7qhlc32kRiWpC E11KTY+YROneRHs3ie5EZ+kXHEniLTz+AjOjEBxpEDffIc4qbNdurdtIOpYCMP/V9IrbbO YNSmpM0J+WePR/7jOl6cW8/bqO3buxutg5JpA0B9fzc5ssZa7wNXL2fXsDDHCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690920386; a=rsa-sha256; cv=none; b=t/D1QQ7AxWoLlOi77+28hH06abggeVzn2CFSPGr0x7tXAPL55BFICj/WZvrM7N8SAAc3Na 812soi9n96kX3faru4XP616T4zhZiuBmWEIENbtQc76q26xhGibYJMLXwZuzKUBgPlNwGb 8AuPio2VHz9mXNUVdbeL0UuEIQmY9bhSWOGOFxqiWjmnle9TewOesy8yomd7visYM4A91f Q0jCgGflTFFLpZV3YJcDmMYtw5d0kDPNa3gAHWAbfFkM4GYW38I+xQkff1X//haobRXhn6 W4wFKoAea08hWvwCO7l7NkcGK5iqhCiy3Sb1HtxO4QwbwMZDP8l1sftnYn/6yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920386; 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=Waf+I+28o+oPnsNb9fHwK6Z+sdHWZV/Psdkl97a0Lx0=; b=fPxrNwIaXNgzVFIG5QS+iSPGLmiiUwd0Sqx4JWbtaQayVFyzgAUztSh03nJ+1DC/FrlzRL a2HTC5h7KBAple+9hxEpC+HYq9EpcFpxjhuvwmmdrLBFxt2oslWP27c8D9T1u2/Onwb/jO Rcq/MSW57rATUSrb5CxBH9452IPjcDgCA0IJoVq1brM5yoyMczgJUpN5/ugmyF//WxJvLo vqFrLotfd9+u90vVkQLqwYoPfYV4aZ47NEDPLjjfQAj32IkQH30uez8GD2FL/yO1usXRsx yo+EtSTHXCWGWzvL1CYuA7zjWOPoSk92r18Y6FWDH81CQhJcndT6smrzl43VOw== 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 4RFmMk1s6hzrP1; Tue, 1 Aug 2023 20:06:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 371K6QPo014114; Tue, 1 Aug 2023 20:06:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371K6Qvw014113; Tue, 1 Aug 2023 20:06:26 GMT (envelope-from git) Date: Tue, 1 Aug 2023 20:06:26 GMT Message-Id: <202308012006.371K6Qvw014113@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 2f6b510ea2a3 - releng/12.4 - frag6: Avoid a possible integer overflow in fragment handling 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/12.4 X-Git-Reftype: branch X-Git-Commit: 2f6b510ea2a3a81dbf929892fe552386ed1c2262 Auto-Submitted: auto-generated The branch releng/12.4 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2f6b510ea2a3a81dbf929892fe552386ed1c2262 commit 2f6b510ea2a3a81dbf929892fe552386ed1c2262 Author: Jonathan T. Looney AuthorDate: 2023-08-01 14:58:34 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 20:05:42 +0000 frag6: Avoid a possible integer overflow in fragment handling Reviewed by: kp, markj, bz Approved by: so Security: FreeBSD-SA-23:06.ipv6 Security: CVE-2023-3107 (cherry picked from commit ff3d1a3f9d71e706f320f51bae258e4e1a51b388) (cherry picked from commit 234ef73f5a33959ab082e1013dcc4f82864cb10c) --- sys/netinet6/frag6.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c index fe9fde6bcb25..c6d42a9eaf49 100644 --- a/sys/netinet6/frag6.c +++ b/sys/netinet6/frag6.c @@ -816,6 +816,11 @@ postinsert: /* Adjust offset to point where the original next header starts. */ offset = ip6af->ip6af_offset - sizeof(struct ip6_frag); free(ip6af, M_FRAG6); + if ((u_int)plen + (u_int)offset - sizeof(struct ip6_hdr) > + IPV6_MAXPACKET) { + frag6_freef(q6, bucket); + goto dropfrag; + } ip6 = mtod(m, struct ip6_hdr *); ip6->ip6_plen = htons((u_short)plen + offset - sizeof(struct ip6_hdr)); if (q6->ip6q_ecn == IPTOS_ECN_CE)