From nobody Wed Jul 9 15:40:25 2025 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 4bchy222bHz60Zb6; Wed, 09 Jul 2025 15:40:26 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bchy16wLvz3ZVk; Wed, 09 Jul 2025 15:40:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752075626; 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=nbuYKtlyItImIcVxJbzIKJRTY42+R5M7kqXNtM/yJ1s=; b=ENTGpwIgXlBbJ76B11L9bNF9TmJEY9cO5MfzYOYGkS+5Kl+ryuLMb22c4kCTauW60SEGak G4JnogQ3yM6zBvqB//wAFWgG4MketfOEvLV9a/NTWPkR4Zj7PfWl5pcW4LMIuMhBVNCT8x Chtt0ZCeaDjBbHwTuFIaEzkGVHIwQ2P61EkueiFEcRfo7coS2IrKz7784AzOUJxwE0zGnf DQDub2EVLnQzZB/ShfMzpFsk2AAcSfaW9jz+LzQMUQgd+hlNc/M44QMLWNn4oNOr8mAQP7 whitWnqiS93PY8zxFqdVoulE8GjNqA/iqDQO83b3zrgMRqGLmKAhDAo1WLkeeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752075626; 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=nbuYKtlyItImIcVxJbzIKJRTY42+R5M7kqXNtM/yJ1s=; b=DVFmYfSCyi20y/OJ/wj+xU84eGsPJbSKgcV2Zvyf+gZPubDo8NyKhWtUl69zfd8fcfrdjs HYTdbgv4XF+fqwJW2blAgIrnM9hMeksaUra36LVEqYD4AUe0TMF6wNrIz6oJ8tsOHg0qCO ZyKYRId9jKtghtrYGNGuUziBZklvRNvXpdiFhopx+vuhFz8RB70CkxoLbOVyeOeVovMbhz HijhUNaHUyxAJpMTMWEyT9VXkDyF/IgXtp3vmeqxQ/L7JCmywT3jB2xXdHPwZvw59PQyNm w4fjmUUVisdti9z1IyGISsVgxiN3dAVR6DLSzXyRyZT3PZa6+2r4WG8AKxhQtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752075626; a=rsa-sha256; cv=none; b=jri2p1E524QDXe3nO1sTHePituHOIXMksuu4E88WO4wxuEzlYasv4r/6Gd6iVCrlAlGyEH oWw4wOLUETfYO4sXBAcPd+Ah44mFtbvt4+6KN4oJQIbP5xO/84C5tZ7+Zbi/eDH9imcLaR YmCtVHu/7vzHSiXeJzVwDq4koWJFcIQrOAdfknCtMHMOxl9KsOH9dpj0+rF+EQnCWDvXFT r4K8AzYEQOXl9tz+6lEgnCTqJ3a3ZUITfanEFEZdTdSnm7KVZF2wNM/FXu79l0Al/ILwJD UDUY9fArV83UDpVRLr6vGJ8kLDrWTieOvLeMLT9A1GSeoAaAA/W/swl2Eky0Xg== 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 4bchy16J73zCfJ; Wed, 09 Jul 2025 15:40:25 +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 569FePUv008433; Wed, 9 Jul 2025 15:40:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 569FeP1Y008430; Wed, 9 Jul 2025 15:40:25 GMT (envelope-from git) Date: Wed, 9 Jul 2025 15:40:25 GMT Message-Id: <202507091540.569FeP1Y008430@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 4af4fefedd1b - main - pf: ignore state update with invalid rtableid 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 4af4fefedd1bf14b5a27387075edde98744b722e Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=4af4fefedd1bf14b5a27387075edde98744b722e commit 4af4fefedd1bf14b5a27387075edde98744b722e Author: Kristof Provost AuthorDate: 2025-07-08 11:21:20 +0000 Commit: Kristof Provost CommitDate: 2025-07-09 15:38:07 +0000 pf: ignore state update with invalid rtableid It's possible for a peer to send us a state update with an rtableid we don't support (i.e. >= net.fibs). Drop these updates rather than potentially crashing later by setting an invalid fib number. PR: 287981 MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/if_pfsync.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index fdedb9424117..64cc476fb3cb 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -763,6 +763,10 @@ pfsync_state_import(union pfsync_state_union *sp, int flags, int msg_version) __func__, msg_version); } + if (! (st->act.rtableid == -1 || + (st->act.rtableid >= 0 && st->act.rtableid < rt_numfibs))) + goto cleanup; + st->id = sp->pfs_1301.id; st->creatorid = sp->pfs_1301.creatorid; pf_state_peer_ntoh(&sp->pfs_1301.src, &st->src);