From nobody Tue Apr 28 13:31:19 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 4g4hCw70xQz6bTNG for ; Tue, 28 Apr 2026 13:31: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g4hCw4pcVz4LFc for ; Tue, 28 Apr 2026 13:31:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777383084; 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=QfAAQ3HdH74QyA43KYSrR3l/0cKAGDELre68ZfCDWi8=; b=T+3gl7adic4YpAtEsbIZ4Zbb3Yh6853o+QA2xuhy7BIEMurzwjSa1VA+0+802g6czB41V8 2XaeFJz3G9aXu/HrKZzmGXllm1NLkc83Vm3M9RplVnCATff3/7EZ4yF6sWoKVPC6mz5F6S e2Ju0e5PGJOEx6JN+/h2e9O73530yrP8u2YJIDL5jv5ftCGNkUnSZGm44sKlBwT/KI/5hQ 8xtdDxhk4US9Cibr9GZOp759yiXfhUmhqcbECVq1IKvPfd+9vVT5tUU+0nTK8bhd+XnN7I KXqJ6/AATAshvLODcT7hjleng8QKYV/UKk8HHS/JF/NZEmW1uB6YRiK8S2g6CA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777383084; a=rsa-sha256; cv=none; b=AIAgm6RoyUnRJDXtMbDnloo/pn2bTAYbmpBZlXnAlkOwSw5+l8O5CoDostjlUj98qDSkgL IKWI48ZFR7wtagu8PhS/lXMqtL4Svj+rQIOIzv9SKe9FIo621HT3P4UyPqDaE+1tIJh98L b+Mrx3beZKEOA9wqIyK+g3e55JNkJBl/X0NBQxU+TJTcTSKO0ytS1jwMfvpF89qm4sBm9K 8QKv9lL4toqPsjAVeB5BmC/bQ6eJDX9cQsxpwp7othhSTuAiq0jUdXXeD5aUHDr5Wz3GsK aoKIaWMppnQsfESgql1R5uW7SIqN5wX5fYxzrh/cil6aOI+fM/FW17ZMw8Asaw== 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=1777383084; 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=QfAAQ3HdH74QyA43KYSrR3l/0cKAGDELre68ZfCDWi8=; b=gbwcQ/XoLF3jvx8jclefpwBYj+DFpuXEtEfu2FiwUmV86LZtCfDCzByrpOOq7+fd+ipsbR E2j+lImKCergSs9URdMRBIHyVKSrDLiVyQCgaOXD0Bi6hiMxhxiRplGk3GL4MakgT27UQo 88Eko8DTwl5xQBzbh7Y1QPGOTJG/viEk+Kf1iyn4049+Oszyr5XCHGEanwfS6Yo1dz5Bjg iCalWcASRk+Fi8DJPZWRNaarsuaOR7BNtgytArez8F9fKLIlbam0tafIbT/BZwmyK691z6 WTg7WqvOodT3R4LxtAOpL9uOe3Zm4eCrndGTxpqnTtEokLZ7ok4moMXcKSHFlw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g4hCw3m1FzvpC for ; Tue, 28 Apr 2026 13:31:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34ad0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 28 Apr 2026 13:31:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: bea1c2fcd783 - main - 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 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/main X-Git-Reftype: branch X-Git-Commit: bea1c2fcd7839fd90a8ce96d6dc6a033779bc3c2 Auto-Submitted: auto-generated Date: Tue, 28 Apr 2026 13:31:19 +0000 Message-Id: <69f0b6a7.34ad0.5db46cc7@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=bea1c2fcd7839fd90a8ce96d6dc6a033779bc3c2 commit bea1c2fcd7839fd90a8ce96d6dc6a033779bc3c2 Author: Kristof Provost AuthorDate: 2026-04-28 08:54:24 +0000 Commit: Kristof Provost CommitDate: 2026-04-28 12:00:35 +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 --- 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 dea40816e30f..53f74271e268 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -8462,6 +8462,9 @@ pf_multihome_scan(int start, int len, struct pf_pdesc *pd, int op) 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); @@ -8476,6 +8479,10 @@ pf_multihome_scan(int start, int len, struct pf_pdesc *pd, int op) if (!pf_pull_hdr(pd->m, start + off, &ah, sizeof(ah), 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);