From nobody Tue May 05 16:25:55 2026 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 4g93m93JJVz6cNT5 for ; Tue, 05 May 2026 16:26:01 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g93m924tgz3s44 for ; Tue, 05 May 2026 16:26:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777998361; 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=Rt8P5D6oL/+HFTpyQ04CEdKMeG0/1Zc+PIF+ZzxgyyE=; b=KC3DFXcpacWhdLvnyNoU1/i7Sy/8YwJbECYdnKuGU4klCDIHXucqDKSoHalDIm/HBkNDgo VKki+jZRO/oN8e5alb7YHc2cuACrxEPebMVfENiuCdgtttK8J8JSaLup9fNDRxkIYo6wFk dKDuduZ3TiW09nqL50MXJfjQ+GpGaLrzfvVDBXElRWoNEAIe8xagCGCJW+L5mr9ucpqF6E j1fziR5XFhUdLxAlBU1PvbP/agwQgPp4yK+TiWW83vliJg/wh/jqpg84n1faBRVB3Vl+7C xYtU5wYdWuFTj2AORuWL0eIZbyubzgY+AQeXpciMGKVIYvstbCB4c33tCjKqpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777998361; a=rsa-sha256; cv=none; b=okWmnM8vT7buq8AFMpm3YVG7RjjL7fMR8Y7DFMhHUjP/J6iw5iDHHvIx+cKuaRGQt+/E6P Yv5bkFmYfxWBJqfaW2dKGZu69DMSR/2mrXPZuJk7v2q6svvRnr741akvAndiz+ZzrczY6z Wzgrt7wb7WjEUvaDL/rKHH5PQBY5hlQGKATf2HT1JxupNnHnMnmzrQpJZ0lhMSZHsjsVgP IHCIrAOyHEemn+nU0sSq96VB0QZ6iYPEEKMQ+hs9onbJ0eep2a9Erf3ITZ88AVt4fY/0LC 7KMrFbAUqEB5k8oPu4v3DAJ52st2OO2fG9AdCewmBCtPW2EAeN31jkZwMFbeCA== 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=1777998361; 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=Rt8P5D6oL/+HFTpyQ04CEdKMeG0/1Zc+PIF+ZzxgyyE=; b=nlGpjoNyHHV3lSnbTiDG/1rQlQkr3R0eAdpZ7f4U8id104xqLaZKs3EYcmn1khIaxldP5L NKDZFwkmHsbWJKVCJRTpn2zHURlkPQAIvWmP1Txmoi2xmxt6J9d4ylix7q1bB3699UtDfV 31N/gf1Itf2wdo3QEEx3WlJZyIMCpJHqXEKcOhQzd2cJN/WE6YkFGzjDlFJEbyEKAB65nA rP4dAfFvsGo3g0xvdTxgElXLwnt0BtrLKUW5vHQY3Dpksy7MhMXCvpCo7ypdEj1K7Aozzu 9CfxKQHzDkcDSbGljxQ3/WkjbORHlBxdUUGafYFcZFVFGC/TnjMNoU665WrleQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g93m91RJhz1Dm5 for ; Tue, 05 May 2026 16:26:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25792 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 16:25:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 730fb48f1387 - stable/15 - pf: improve ASCONF chunk validation 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/15 X-Git-Reftype: branch X-Git-Commit: 730fb48f1387812ab82ea3b0ef807e6824425318 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 16:25:55 +0000 Message-Id: <69fa1a13.25792.1bd373d@gitrepo.freebsd.org> The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=730fb48f1387812ab82ea3b0ef807e6824425318 commit 730fb48f1387812ab82ea3b0ef807e6824425318 Author: Kristof Provost AuthorDate: 2026-04-28 08:54:24 +0000 Commit: Kristof Provost CommitDate: 2026-05-05 07:33:23 +0000 pf: improve ASCONF chunk validation When processing an ASCONF chunk we failed to verify that the chunk length was at least 8 bytes. As a result we might end up passing a negative length to pf_multihome_scan(). Fortunately this merely meant the function did nothing, but we should discard such invalid packets, so explicitly check for this. MFC after: 1 week Reported by: Mark Johnston Sponsored by: Orange Business Services (cherry picked from commit bea1c2fcd7839fd90a8ce96d6dc6a033779bc3c2) --- sys/netpfil/pf/pf.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 7aee28e7b917..05a71cd45a35 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -7794,6 +7794,9 @@ pf_multihome_scan(int start, int len, struct pf_pdesc *pd, int op, bool asconf) NULL, NULL, pd->af)) return (PF_DROP); + if (ntohs(ah.ph.param_length) < sizeof(ah)) + return (PF_DROP); + ret = pf_multihome_scan(start + off + sizeof(ah), ntohs(ah.ph.param_length) - sizeof(ah), pd, SCTP_ADD_IP_ADDRESS, true); @@ -7811,6 +7814,10 @@ pf_multihome_scan(int start, int len, struct pf_pdesc *pd, int op, bool asconf) if (!pf_pull_hdr(pd->m, start + off, &ah, sizeof(ah), NULL, NULL, pd->af)) return (PF_DROP); + + if (ntohs(ah.ph.param_length) < sizeof(ah)) + return (PF_DROP); + ret = pf_multihome_scan(start + off + sizeof(ah), ntohs(ah.ph.param_length) - sizeof(ah), pd, SCTP_DEL_IP_ADDRESS, true);