From nobody Tue Aug 1 20:03:33 2023 X-Original-To: dev-commits-src-main@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 4RFmJV0MPsz4pncJ; Tue, 1 Aug 2023 20:03:33 +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 4RFmJP456Xz3GMw; Tue, 1 Aug 2023 20:03:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920213; 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=eBSdMj3ITUeKzKIIPtdap8h5nyrO91qimkEag0cldrg=; b=eaEC1GmXrbyzto12P+ettjLSCwFCQvOTZZEpY8gBu/rGKEbKohL/G3DcHKOo/rW9dnGXHL moqTVsE1l3rtGC5rCYY9+iMvhrJ2TiCmnnKU6ZS0EoO/UJyojpGU9sBnHrGqT9Bd4/0ZVX Egm4w42x42D4CBvEQNs+Qau68rtVzesl2+1E0NNd5tDLlaC36yU5HLxZMItcBm4+OCs+Pp Y0wLmV0Rj2OJLQtjDRflYiyHQ0mJ++jmncoHwshDNALDBwVtPRO+XPNQWSz5JA/P+VOpm1 bRIY/5HlQfe/UuD7ALxL6AFv7THm1C8njybm62fPmIfjV5wm03OfjvdunPL4MQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690920213; a=rsa-sha256; cv=none; b=gn5XV5HbRIxsnQw+uEnZ7yW/vpHqbnOPE75YrnKrdC/OE4kHSjGot1MyrtXd6jwzgF9Ugf OHlqfXzYoyn/xhvl5Syq7dvqbxRQRkilo7DGeFD2z/BRg3I0spExg/pODLZwNA+Ce0sZvF TUqdNiOSYQTeUKCpbsms3G3eOXuM1bV1Sxc6+Zss7nJ7Nuj/kKMwiit1wJnPzwhgLOlhgV PzTIr8PwwdIeHW49EbWV3Je0kd3P3kJb94kGYhfgnyV5m7vH3MGUxcnjmXCduT5dPunIVB 0nQNCRiGJPU9+nuEklTnYNN1vnVQaRWfl93ofe/Q1916l30YPFARBl/d2r610A== 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=1690920213; 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=eBSdMj3ITUeKzKIIPtdap8h5nyrO91qimkEag0cldrg=; b=DLd4iTvkKNYfOdeaXgxlBlmlpQYhqDnjCemTzwD2Wvb7alfvxwXDAr1WKL4PsvP5Ppsp+b 8P4FRlkyP5eGzwsFM+0EDRvC4y+e1TOb2N1M68iNaNCaGDvG3suErT4YWoQ/oR0Bs+xLZv sAn8iLCjaO47hbHtT8IvTEYvt0sHeREGGDXU+/IZVeXS/tt+D+2vWGB7XD6SZRTBa/QYmn ZdwOyC1TNL+G71l5BzVfuqMPsM4gohS7Ztl54V12ILTQBk6aI0cRfwHHy/+IHuwN7WNPsn hU3b6NjouA4jn6jBji2JJI+YNC3SNtX0eZpn5ta2T0ehhWvMtdTg81l8C8rRVQ== 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 4RFmJP15DmzrJ4; Tue, 1 Aug 2023 20:03:33 +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 371K3XYd012667; Tue, 1 Aug 2023 20:03:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371K3XrR012666; Tue, 1 Aug 2023 20:03:33 GMT (envelope-from git) Date: Tue, 1 Aug 2023 20:03:33 GMT Message-Id: <202308012003.371K3XrR012666@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: ff3d1a3f9d71 - main - frag6: Avoid a possible integer overflow in fragment handling List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: ff3d1a3f9d71e706f320f51bae258e4e1a51b388 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ff3d1a3f9d71e706f320f51bae258e4e1a51b388 commit ff3d1a3f9d71e706f320f51bae258e4e1a51b388 Author: Jonathan T. Looney AuthorDate: 2023-08-01 14:58:34 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 19:45:41 +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 --- sys/netinet6/frag6.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c index 5acdc1b20981..9837c6662888 100644 --- a/sys/netinet6/frag6.c +++ b/sys/netinet6/frag6.c @@ -861,6 +861,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)