From nobody Tue Aug 1 20:05:23 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 4RFmLX25fRz4pnpH; Tue, 1 Aug 2023 20:05:24 +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 4RFmLX12ymz3G64; Tue, 1 Aug 2023 20:05:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920324; 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=apDQTXwQTJzfgIgJH3Ed9ZCYXkT+nQS23Bmcrpxap/s=; b=IcmEUkWXkJMeJyu4MArBGyvDGvGSI1jLr0nhYrlDG0U7GEFB6wG2Ck6TBldCcZQhpy9lDF j2GyxHB+at0YA1TepXVFoCFx88VM2m83j9D0pjeLXihLeg4rWrZA/mpEsoJcpVXug0gpDu s3xTY8vFQ4baHzKF+MlLRaVXVULWYZPNJALoeNoGgzeGgbSegRBbdM5UH9Bbbq+Ck1PZ5/ gMMMP2PP4KSbCBg1WFmPZj/FcQ5ABhQ7z2mFBhJP4DytVbJ0BIhTiC0jIVdqvlZJkqXFma S7GOW1yJ4ovIOJoJ2umiLG13pnhXA3PGKaFTQyEjbRNdQoJ7ZFAK5kI+oL6lcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690920324; a=rsa-sha256; cv=none; b=oS7aoM17kVya96EOrRLB1nC9Ipm8LX3d6NejBIdOfaFWOhqe3ligk07GFb+YvN99NTH1ry EHV4U5jPKEvSnqKmuIckZH6E0x2Z8qst7TKdMI1el+r4nck6C6T1/UOEVxoovg6ovIJ9kH awC8Vg8mOeRmUYzN/ciCuhPp6DcPPZMMXynSrftXdk26zmVE1YT1rKcx36mfntk9bXBEV0 L4GI5I7YoWMsr4NY5jErgYT0t60E/dKWF1pT6Gof6OzqnWhYOZFs8JlqDAKSbn5CbZ/PwA ou91ZT6gBe97EsVI3x5aZVl+WzvaQ4iosidlVEEjX5nWwjmYDzaOyqkhSw9GTw== 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=1690920324; 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=apDQTXwQTJzfgIgJH3Ed9ZCYXkT+nQS23Bmcrpxap/s=; b=bkpRsKzdys++6DdA0MLCQm7xerYvlnhDXuOiNmXEfCZOSxQkusl0iSuDnY4QqecklhThV2 S/lMtFM9+CW3XJixoHwkzro+N1PYHfj232cegCxADALTV6IxyBVXm0WakhCnfAwEVAJ6H9 W68jEv1bNlJENfwqRC8uBzW0n6OnOuE8l26KHZEs6sOzEJsobMlvCh/tCBOHiwQCiRHNij 5bW7S6p92TVecMrm2BVRrye8Jav+mfUz0lTIVOISB+1jZFPLNaa+aKGGLbXWVq663C6OwK m4Q5yDEjYCk+NfmeakUOjZl7yEVzfbfWHxoefyK/Rn61n7UXQChHZ6zsaQo/CQ== 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 4RFmLW6bqRzrG6; Tue, 1 Aug 2023 20:05:23 +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 371K5N7n013825; Tue, 1 Aug 2023 20:05:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371K5NJT013824; Tue, 1 Aug 2023 20:05:23 GMT (envelope-from git) Date: Tue, 1 Aug 2023 20:05:23 GMT Message-Id: <202308012005.371K5NJT013824@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: 234ef73f5a33 - stable/12 - 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/stable/12 X-Git-Reftype: branch X-Git-Commit: 234ef73f5a33959ab082e1013dcc4f82864cb10c Auto-Submitted: auto-generated The branch stable/12 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=234ef73f5a33959ab082e1013dcc4f82864cb10c commit 234ef73f5a33959ab082e1013dcc4f82864cb10c Author: Jonathan T. Looney AuthorDate: 2023-08-01 14:58:34 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 20:05:08 +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) --- 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)