From nobody Mon Aug 28 12:03:21 2023 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 4RZ8Ms5YH0z4rTRb; Mon, 28 Aug 2023 12:03:21 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RZ8Ms53JMz3dYJ; Mon, 28 Aug 2023 12:03:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693224201; 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=GCkRauaOMaJhI3VbByjEX5NQ7SmeGxy1LVNtbN/wcyw=; b=R4tKGh1tLo9F7cYp97dRiItGjNDPCg8nUzNDYAXe/Pb5Joc08tXkr7i9bXocYTRani+CXt 0R3XvMrfV7kA4u2p9sqsaOjpENdbq+RRZR02HGJcOdJgg2LzTEXLmpwtDieJQzgbBGFSeY sOk/5B5hIXipbzrwdBck0/+8E90MuVhxuJFY+phKfHjV2LDtmpjRTp7zNY4mX22hHxsPZi RgL0h/PorHmyU+Zj9pdTGWWATWdmbO0nTXarNFVMET3V+8UKY8PeD1FlQhv8gbVhqHEnAT g6NeFbuQIge8L6KFd/ed3CvXeLyjlDn1gu+z0GYYR2rBRsNEyRdactL3awfwLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693224201; 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=GCkRauaOMaJhI3VbByjEX5NQ7SmeGxy1LVNtbN/wcyw=; b=JMWVQBF0kqKZFKAFJdQ/IDJgSmgGWAItcbNYsWn7a8PPR70i+sUweAy6W2uhUfbAhqfsYW NUPREZq2Hu00qxfHi+gw9LbLYLml+NRa4T9RrLw7OcXmbykZ5QNYA3lETcQWGG4AupBvq1 ZYiLH2SpF/qGU/n9GxffIVtHrszJWwsRMAYnkJp95/h6AbwgojRqMp3quoBRMN3HUjtjxr bN7VQsFyb2q8l15cqnyI6+9ARV0JWiCH2U3DC3mRScGbrDBy0iUYLgCvo7466eHftUsUzX SVVJQm29bTn7EjAdV+YriKaFXzbi2vz6b8W+17DgOCZFBEX5/ZxWXIR+PzRIlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693224201; a=rsa-sha256; cv=none; b=BvdaL5/jzTeR0woCecst4oj+/zRo1ia2MNGBbsb4HocWwCiWfpE3tu45tMc3/JIkcZYihu t4zEJ8nKjjKa13Us1YjVSyGSNvHmdyDZCA1lhpxrANg+37gVr7B9Y9gcYSWTjRKTHvwKDT 1xrnPtE/Um02609ByHGi+j+PuhHAOVs75JcECBlcsLnAtnx5gO7YJakaS32oB3WhJnI1f6 QM6NRNIxnH7QcRJZtfEFXSutz0DfiXkdXlaT8uI4ymr8SgwIIqhMOAqkqCYndSddAfRaEM nNscQsz2qLmJ3stxEk88mIs8qJHYORDdNlkhdK+w4YcP6TVUR/XrWzj4hckiXw== 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 4RZ8Ms3q6Vz16tV; Mon, 28 Aug 2023 12:03:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37SC3Lp6030482; Mon, 28 Aug 2023 12:03:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37SC3LRO030479; Mon, 28 Aug 2023 12:03:21 GMT (envelope-from git) Date: Mon, 28 Aug 2023 12:03:21 GMT Message-Id: <202308281203.37SC3LRO030479@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: ae0512bb02cc - stable/13 - pf: enable the syncookie feature for IPv6 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: ae0512bb02ccd3d878b1d0cf6ee5c77942120a21 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ae0512bb02ccd3d878b1d0cf6ee5c77942120a21 commit ae0512bb02ccd3d878b1d0cf6ee5c77942120a21 Author: Kajetan Staszkiewicz AuthorDate: 2023-08-21 06:01:29 +0000 Commit: Kristof Provost CommitDate: 2023-08-28 08:17:18 +0000 pf: enable the syncookie feature for IPv6 When syncookie support was added to pf the relevant work was only done in pf_test(), not pf_test6(). Do this now. MFC after: 1 week Reviewed by: kp Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D41502 (cherry picked from commit 92d4152295bc670b80352b5fbe102565de99a4eb) --- sys/netpfil/pf/pf.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 49 insertions(+), 4 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 9c1d11952a90..99fca2d6fabf 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -7220,6 +7220,17 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb goto done; } pd.p_len = pd.tot_len - off - (pd.hdr.tcp.th_off << 2); + pd.sport = &pd.hdr.tcp.th_sport; + pd.dport = &pd.hdr.tcp.th_dport; + + /* Respond to SYN with a syncookie. */ + if ((pd.hdr.tcp.th_flags & (TH_SYN|TH_ACK|TH_RST)) == TH_SYN && + pd.dir == PF_IN && pf_synflood_check(&pd)) { + pf_syncookie_send(m, off, &pd); + action = PF_DROP; + break; + } + action = pf_normalize_tcp(dir, kif, m, 0, off, h, &pd); if (action == PF_DROP) goto done; @@ -7230,10 +7241,44 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb V_pfsync_update_state_ptr(s); r = s->rule.ptr; a = s->anchor.ptr; - log = s->log; - } else if (s == NULL) - action = pf_test_rule(&r, &s, dir, kif, m, off, &pd, - &a, &ruleset, inp); + } else if (s == NULL) { + /* Validate remote SYN|ACK, re-create original SYN if + * valid. */ + if ((pd.hdr.tcp.th_flags & (TH_SYN|TH_ACK|TH_RST)) == + TH_ACK && pf_syncookie_validate(&pd) && + pd.dir == PF_IN) { + struct mbuf *msyn; + + msyn = pf_syncookie_recreate_syn(h->ip6_hlim, + off, &pd); + if (msyn == NULL) { + action = PF_DROP; + break; + } + + action = pf_test6(dir, pflags, ifp, &msyn, inp); + m_freem(msyn); + if (action != PF_PASS) + break; + + action = pf_test_state_tcp(&s, dir, kif, m, off, h, + &pd, &reason); + if (action != PF_PASS || s == NULL) { + action = PF_DROP; + break; + } + + s->src.seqhi = ntohl(pd.hdr.tcp.th_ack) - 1; + s->src.seqlo = ntohl(pd.hdr.tcp.th_seq) - 1; + pf_set_protostate(s, PF_PEER_SRC, PF_TCPS_PROXY_DST); + + action = pf_synproxy(&pd, &s, &reason); + break; + } else { + action = pf_test_rule(&r, &s, dir, kif, m, off, &pd, + &a, &ruleset, inp); + } + } break; }