From nobody Tue Aug 1 20:04:38 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 4RFmKt0MTkz4pncn; Tue, 1 Aug 2023 20:04:49 +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 4RFmKf2NvLz3GfD; Tue, 1 Aug 2023 20:04:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920278; 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=NYpP6NcQEHoF1eTqrfdRGUf9sXEWdHYZjVCeOTN7/kQ=; b=jNbKPhEm6GiPRVpESKJ2a3U+vrxwmBRDpLGKwQOB/WnPdZqFp0AOoEkLTSM5cRkmjiIx/Z SpQdPOKosMnWDoxTJ/Zkdnv5LhOfTVAh3x5D85YS8yAR7gMucKkmcHhf5KVqEJbf5V8aYK ytuWG/uNCDw3f9toNn9bgqkuF3TluZrjGivyMHcBudp2yUV9JOb6+7BsNOa9V8wfdf7iDJ UilZ9/kJ5Xt6U3vs9cpYAmUq6T1UNiGKjCvybi+s5G1cJMkfKhbmZFeu390/O+NsVz7aLs 9ePdKT6lbiFaFNrFNATKyEdY0gCx5an6b49IpqP4v8F8j5MoTRqSgNHPTBn7JA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690920278; a=rsa-sha256; cv=none; b=qa5MUPToWwV9eS592A5VbB8EFT0tvlB5iH7rogM1ge+XykC+CefDWyxqQQULWB9muYG8gx 7I3iAOxXvPq4gzxXfmJTFTlP9lW8MxDEQB/kaoCnDb7Ag5FBnUBmdHYfAKkqbVCYWasCGd chT5dkiEx5758l3gZyOeQNxaCxUd55gCCmyoB1hvt903guSlU95OBfiyxisFxa+zTEdp/d Iyd0Y2TTB9SH7Ryy5Jlz9ZGT550Dvukg1W2afwiptpYNPjxQpjAogwelSF5AFB3daY8+pT w67y4OGmoHy493vadMtoM+EIVIDtMU0XKaiH78xDRBnCxl5RuuJ98awmOuMp1A== 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=1690920278; 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=NYpP6NcQEHoF1eTqrfdRGUf9sXEWdHYZjVCeOTN7/kQ=; b=FpXCH9xNJgdA9tZnG3aGnUzTSxLUo6D91AXTjaP2OY4a7ecnD9b88LgdySJ5jMDl1jnPL3 w4UqTwb9CDMrmUFWcVCa2LSiD+5QCFdx4DxVqVbEwKEJziaDLGOZETxXIq/xAxAE3S4fVd mBPInfSlcrkyqYO5UHSo9C1QRjS6/5e5YcDC/AmLitB0dn4PeDlsfl3kpayTx6lucX0UNS yaf3DApIc4okpj7PVHG0CHpWahlCc09T5c5yGXkrOjsO1UJDNr6MlOd1SAZj1aTFfwFXzO z49ctlYNcfZeiesItHQ9wWXS4epyW60/QlreihkeV3+uJJIbGVnlajAXNSQgGA== 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 4RFmKf1C7bzqvN; Tue, 1 Aug 2023 20:04:38 +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 371K4cwt013485; Tue, 1 Aug 2023 20:04:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371K4cs5013484; Tue, 1 Aug 2023 20:04:38 GMT (envelope-from git) Date: Tue, 1 Aug 2023 20:04:38 GMT Message-Id: <202308012004.371K4cs5013484@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: 4e548c72914a - releng/13.1 - 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/13.1 X-Git-Reftype: branch X-Git-Commit: 4e548c72914a4eb63c16556484ab95628d70adcd Auto-Submitted: auto-generated The branch releng/13.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4e548c72914a4eb63c16556484ab95628d70adcd commit 4e548c72914a4eb63c16556484ab95628d70adcd Author: Jonathan T. Looney AuthorDate: 2023-08-01 14:58:34 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 19:49:52 +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 9515f04fe3b12b9e6ef6c802b647dd4cbdba621b) --- sys/netinet6/frag6.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c index e0857d3af3e8..023470b20033 100644 --- a/sys/netinet6/frag6.c +++ b/sys/netinet6/frag6.c @@ -806,6 +806,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)