From nobody Mon Jan 20 16:27:52 2025 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 4YcG3F1Xj6z5kJyY; Mon, 20 Jan 2025 16:27:53 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YcG3F0mQYz3SwY; Mon, 20 Jan 2025 16:27:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737390473; 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=w4FnXSwKJghk8Q6ekNWLhBUmMLPG5Xw2P3Yy+QC/JuI=; b=FMfs610vHf0OQ/xXaXKm1l9xCSiG9mASmYlRSMyMv+VE0eOR300SODIjLCUdCvsXFRfP0h dTXV53Gcj0orW3EF8MjIhd3aNGdNCjPjTs1B8NXkWSVbyk83xKXBRtFLsEwYfutqn7SrLq i5MkNqNd/ZLVgMVY4qVDbhUnjcBLCXb1z4ufOtkSF1DUx2EHRB9BPDBVOR8CE4YPRS0y2s 1gq83ZwPC4JQPTTBT90EjoNlNHTL4SMDvTf3yQOGRe0LvpOxw6R80jdon6BrJhQQDn98Ox kzOzs8ErUwb9RM8uUf8Nd3RnD8nHJ9yBIsv3s3ShiVhiAn/1Kpc+wh2ADVQmGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737390473; 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=w4FnXSwKJghk8Q6ekNWLhBUmMLPG5Xw2P3Yy+QC/JuI=; b=qtnCtaJm9VGrbvVR2v4UVvv+VrVt/uiWl07hlgIqjTfVU2aiPsylXN+NhjT8gvQOyA7Uio WdsDElPBoiqZGfFP523IwZhkSJwHQwyxgWg0n1qNbSTyjdfFO9OIn2HuQB1pq+hNV2yE/R 7nu3yqvGXgivIPuVAd6zb5v1SWIby28p7uLTEMYyyTEqBiprPY7FAbpH4/jTh/EzFo7i3U pyqHRcVBfsnlkCalDuw4zWNtW5l+jYXHt/M9pIlC2l70CA4XCmtP34+eDsIPte45g4Oc1C XbhdT9ZgQyZLZHrA8+kaFKm2qvssGyEk8PbJoh9wjKdCnos95bqUKPe2eah+MA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737390473; a=rsa-sha256; cv=none; b=T+jy9tKMh/BkG1NQldlMmBF1YqMJhBt/HiNwD4lVsUGDlBDNhnvSend+y4YB1CBixHzhfw UaAgUZ9c4H0xO70GsyEEdk6AmljfQ2LDO8T+iliyqLrDcpMnLuSybFMeaZZirnZtAqb1R3 GdYUoTYwdeSAe9TLv17w8CKWngcr2zHFJqLMrEP+LNSfLCaWqZhTiZCeXI24/plR+0PrBm AU3/WawTnAAlNpaSf6M6vN1b8zZ/rBODR8fui1KxuXPDSC6iUT848QkIvGFoyDADXCjFhP iLbgfzpU1Mbbj3nTMU9329Bw8OnXadpQOVANRPbqvXfj3DEoPjnRa4JxgPX07Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YcG3F0DdVzC73; Mon, 20 Jan 2025 16:27:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50KGRqnM012670; Mon, 20 Jan 2025 16:27:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50KGRqSL012667; Mon, 20 Jan 2025 16:27:52 GMT (envelope-from git) Date: Mon, 20 Jan 2025 16:27:52 GMT Message-Id: <202501201627.50KGRqSL012667@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: faec43a79bf9 - stable/13 - pf: avoid use-after-free on reassembly 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: faec43a79bf9a43ac3e2bc3e1de244dd31868dd3 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=faec43a79bf9a43ac3e2bc3e1de244dd31868dd3 commit faec43a79bf9a43ac3e2bc3e1de244dd31868dd3 Author: Kristof Provost AuthorDate: 2025-01-20 07:11:14 +0000 Commit: Kristof Provost CommitDate: 2025-01-20 16:17:10 +0000 pf: avoid use-after-free on reassembly Ensure we update the mbuf pointer returned by pf_normalize_ip() or pf_normalize_ip6() even if they fail. Otherwise we'd risk using a freed mbuf. PR: 283705 Reported by: Yichen Chai , Zhuo Ying Jiang Li Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 5d28f4cab8d5919aba1365e885a91a96c0655b59) --- sys/netpfil/pf/pf.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index e5cd0b83ac0c..b5f872d40b02 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -7468,6 +7468,7 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb * pd.pf_mtag->flags &= ~PF_FASTFWD_OURS_PRESENT; } } else if (pf_normalize_ip(m0, dir, kif, &reason, &pd) != PF_PASS) { + m = *m0; /* We do IP header normalization and packet reassembly here */ action = PF_DROP; goto done; @@ -7679,6 +7680,10 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb * done: PF_RULES_RUNLOCK(); + + if (m == NULL) + goto out; + if (action == PF_PASS && h->ip_hl > 5 && !((s && s->state_flags & PFSTATE_ALLOWOPTS) || r->allow_opts)) { action = PF_DROP; @@ -7936,6 +7941,7 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb /* We do IP header normalization and packet reassembly here */ if (pf_normalize_ip6(m0, dir, kif, &reason, &pd) != PF_PASS) { + m = *m0; action = PF_DROP; goto done; } @@ -8210,6 +8216,9 @@ done: n = NULL; } + if (m == NULL) + goto out; + /* handle dangerous IPv6 extension headers. */ if (action == PF_PASS && rh_cnt && !((s && s->state_flags & PFSTATE_ALLOWOPTS) || r->allow_opts)) {