From nobody Thu Jan 30 11:02:02 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 4YkGLf3cCbz5lyqW; Thu, 30 Jan 2025 11:02:02 +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 4YkGLf1mg4z3gjl; Thu, 30 Jan 2025 11:02:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738234922; 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=zI2n1mPCq1/3GhVDZFa+yaAvjq+1xAulDjIsda7YfR4=; b=N5IoCtCkYCiHfhXQjZ00UFhauZH/T/plPQGEh4PC7EV0pO9WEcyo5y4nHicAaoa+cxf+rq nWWlvllK5NH9w/xzjz80RYIBcW9180YIPR5nH2vPiCFVWXEYNeLHop0CbWUnii6g8Ov28C /LXvTXkduolGssDMwuZvC4idf2cHc1rzTZKdQ8BwNdiwrJ0dt66r/7UT2Gp+/UXhCWq2ow c87krdwLXEab1Uo2efT/FstcnOv0kIka5/tGFGwApzj2lAbvJ34zINXvidkhm+jmqbMvwQ jeg4n/uQWele1pdgHTo0r4lHh1u7ZLrmVpuinZICHTSul7h77ypbkhyVKPqzbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738234922; 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=zI2n1mPCq1/3GhVDZFa+yaAvjq+1xAulDjIsda7YfR4=; b=ae0q8SPFDeJ6hhZwmhzfRov0dw+O3JAgBERTVlxMXjeUH03UqCbxHq02tWIsBYKj4/4EUt 0UCLcpMC0TGWEaX07umCPDfOSIy2zOoNS7BfIT3O1rn6jf1+BZaGtyctfN7n2qJ/xxdtA0 Vj64q2jXw1HuBckPa5k1e+CtQ3Kj8EiqazLsWVqHgkmkWu7cY/VIb+3Ka/pqX/tIRAqmAP dR06UG7raFyK8uZpY6W3+OiI1RICzdAd3uyGjV4bfMKVcR6StFtqnnkcJWZeWmcNbhOyYL 4L/LuE6KdGIIpBZF3pM4D1/DRNoOcr77nMd2YWmoLLQhe43FrXF11qtXobuBtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738234922; a=rsa-sha256; cv=none; b=GQEj1TfvSl/WcdMOoAV/KpfmYb7AljJEE+yzS0hWtcdo2IC4N6EusHJvirQBUP5Err9RDX paqc0RXkNMUbLaYu/CExHHo6aruKNe9wJ8LqXtTrkU+/hydL3TG4FJ7BlM3ggzquubVomv KmxisDZzBQq3BufwlLNOpTn9jSMZZjhdSzpF0g6J+PPTocKZ82Eq7e56d3n0hYzT9HY3N/ NHgbQDVCSxr/wBwQ5tgm/4CCBulB3vvl7hQ9wruob0kCL0W1aqhlrTM1RC/TX8g6zdka5d sgSXto/UHbXqIj2ed6b6kvceVFI/R/K08Vg/xfmungoVuqy6g8W1sUQG99sx6Q== 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 4YkGLf1MznzlW5; Thu, 30 Jan 2025 11:02:02 +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 50UB220l077953; Thu, 30 Jan 2025 11:02:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50UB22JX077950; Thu, 30 Jan 2025 11:02:02 GMT (envelope-from git) Date: Thu, 30 Jan 2025 11:02:02 GMT Message-Id: <202501301102.50UB22JX077950@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: 4557b1693a11 - stable/14 - pf: verify SCTP v_tag before updating connection state 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: 4557b1693a11246d2ae9adcf03bd2a4a35d79aa0 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=4557b1693a11246d2ae9adcf03bd2a4a35d79aa0 commit 4557b1693a11246d2ae9adcf03bd2a4a35d79aa0 Author: Kristof Provost AuthorDate: 2025-01-06 09:06:58 +0000 Commit: Kristof Provost CommitDate: 2025-01-30 11:00:30 +0000 pf: verify SCTP v_tag before updating connection state Make it harder to manipulate the firewall state by verifying the v tag before we update states. MFC after: 2 weeks Sponsored by: Orange Business Services (cherry picked from commit 4713d2fd5663eb64aa582dabced21d253c901a66) --- sys/netpfil/pf/pf.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 255d85440fa5..15569a294f98 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -6200,6 +6200,13 @@ pf_test_state_sctp(struct pf_kstate **state, struct pfi_kkif *kif, return (PF_DROP); } + if (src->scrub != NULL) { + if (src->scrub->pfss_v_tag == 0) { + src->scrub->pfss_v_tag = pd->hdr.sctp.v_tag; + } else if (src->scrub->pfss_v_tag != pd->hdr.sctp.v_tag) + return (PF_DROP); + } + /* Track state. */ if (pd->sctp_flags & PFDESC_SCTP_INIT) { if (src->state < SCTP_COOKIE_WAIT) { @@ -6231,13 +6238,6 @@ pf_test_state_sctp(struct pf_kstate **state, struct pfi_kkif *kif, (*state)->timeout = PFTM_SCTP_CLOSED; } - if (src->scrub != NULL) { - if (src->scrub->pfss_v_tag == 0) { - src->scrub->pfss_v_tag = pd->hdr.sctp.v_tag; - } else if (src->scrub->pfss_v_tag != pd->hdr.sctp.v_tag) - return (PF_DROP); - } - (*state)->expire = time_uptime; /* translate source/destination address, if necessary */