From nobody Wed Jul 16 12:47:26 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 4bhwnB641tz62T7F; Wed, 16 Jul 2025 12:47: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 4bhwnB5P4Kz481S; Wed, 16 Jul 2025 12:47:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752670046; 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=b+3UpC4QElSw+qm0wYibKEDchnxkqta3bArgru/Wsjo=; b=wAnoFn/ia/weDOs8w1rjW9Sguv65PpHwfTfjyAUpMbBZD7rWZSvv/Az3nql+ooNGRQ2gHo e81X5ZMOu8p4NmDj9kjFSvYHpfIyxln3nflnlX8nVmuR3owGSprt1J1ZGivUIkVxN6DBD7 5/NgoDlSFptaGqV9oBVT2gGS/pRiCWTxH1CpR1pimtUcwZBhX2EfmSWNBPeUqKG1kqnWCB YYgDS9HIsGHsHJRArW3e0IIA/ZZPbBtJd7aZzqUTAwfM5AFlCnZCTbl6m0ONZaqjYk7N92 Iyrd29HnsCTxmZFu9D9UaaA+CrFd71ob7n14vLtMtVwtt2EWuOx4msFOFf27EQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752670046; 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=b+3UpC4QElSw+qm0wYibKEDchnxkqta3bArgru/Wsjo=; b=KkQy+NB9DmBLKgzaXhEfO73nYKvQDumCooRK5dOG7jSkzvJar8pjvEnb7unKF3vesDzpDG UG7wIsyXxnI4/Z5tf5h5KMFIc+3U0MPrIFtsc31Z3cKLfGMcEZ6e+436ZC1OxTzyAeDVJi ig5nIvZKh6Q3sbCSZMkvXRDmDuoIuil+sw5HVkiFSsKLolCfk3aDfFt9Uqordj/VNclygB y49VZnCChUcMCN5thV71sRMgam7DI/rODbwjcQHu8oD//YUfvsnP/es0uR4XJzI/eLQN2P SQHY3rUt1f30WhqDSUUB7fbE1B523dlIh68SjH5mGHrs67P7SMGWKyr+s+dGeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752670046; a=rsa-sha256; cv=none; b=PhwKd4c4isMzZyri9cSxU/GVsLkrxIYFug2dDlCbSTdUVe+fAMljGz6ByzFXfSZWI+YAle 5j77R57B31RO6FJGvcJJ+H2UEa5i/QsT4HSsp0m7VAbERbyuJpvdgRs7GZmKi3lbfNTN68 rxg7rM2Izoa3Vxpil8VPWLHi3k8VXf4s0q9FeYLDv9l97lnvN0K6n7BeuheJpdfE90Axml H9f/Q1nOIsq9CuvqoaM9UspZ4SiR1u2YeOJ0ZuTzFDG19RSP5Key2pT4UuNWeFIT57iLTw wWu9HxPwtrg2K2AfLs7gqE+R+k0044PfwhuXPX03hvA17bTFd0QVPOSdZZ+jSg== 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 4bhwnB4R5Vz1PZB; Wed, 16 Jul 2025 12:47:26 +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 56GClQip042095; Wed, 16 Jul 2025 12:47:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56GClQgo042092; Wed, 16 Jul 2025 12:47:26 GMT (envelope-from git) Date: Wed, 16 Jul 2025 12:47:26 GMT Message-Id: <202507161247.56GClQgo042092@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: d7e62fc3d719 - stable/14 - pf: ignore state update with invalid rtableid 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/14 X-Git-Reftype: branch X-Git-Commit: d7e62fc3d719469297681919b7bf0ed010b05344 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=d7e62fc3d719469297681919b7bf0ed010b05344 commit d7e62fc3d719469297681919b7bf0ed010b05344 Author: Kristof Provost AuthorDate: 2025-07-08 11:21:20 +0000 Commit: Kristof Provost CommitDate: 2025-07-16 08:06:10 +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") (cherry picked from commit 4af4fefedd1bf14b5a27387075edde98744b722e) --- 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 64c938ee52ee..8c080b472653 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -699,6 +699,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);