From nobody Thu May 8 13:10:37 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 4ZtXYn27q2z5wJQZ; Thu, 08 May 2025 13:10:37 +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 4ZtXYn1L6Tz3LcF; Thu, 08 May 2025 13:10:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746709837; 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=fANIn10d3CU9O+C99Ocb7D/j2tZiEjc9/eXb3K7Yxy8=; b=aKb4sHfdLSPN6R8NgZ+xr8I4Vs9qekILvMNw/seDw95gy2NYcQCSQKV9WimU6RoQteTE9W IhjibhtOEVa0uE8UWjYVSZC812WsmX0z18qgFyv7S/mESrA7vojrSc1lXxiiR/7s1NJqs1 PR0Ly6/0RfqbmoF8XA6DujKgaDn3tjlCo9xFCpmyJ2VUqNVYIe1FHIWpdy+chAqX4MADor H3oOvVNw/G7yISgLtIQshZ2sj+udH1SmCU9RIZ90LJNtGzeGnpYGzoQ74D2xozBD0jE79I 6L3F/bVeogC170DF3DlVPjd3n9LoZskFvj8WvMWUAuyqTkHWDNjLUjsHKOJ2yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746709837; 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=fANIn10d3CU9O+C99Ocb7D/j2tZiEjc9/eXb3K7Yxy8=; b=jgGQiCHgtyNgc9ROOZymK+SnmhsKI2hZ02AeeRZxXWcgej+C6rqpaTU8AFw6iyTkjONuJl +2KJi50KHL5Aw18WKwLclhMsMrX0MKsAFz8nO/cKQWCGezLfy8QHgPBgV9m217rSdODBAp Y/mD8qTPO+bwUlUkt9heMg/oUtV3RhHg/pCSEFCvZqtbg9hbwOk/1jK9AKab1TP179o0wm tDbLIqNzOqpyXASD7vpzXFS8KgnmSAKX1FpdnZs8gU6273bvfA/HsyTAU5g1ZjoTJ6YEC8 92ICE4jTbxQhg2sSjy+5b9R6T7YIxo64l9zBmg2rhdxNIKiqsxxxr4UHD0fO5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746709837; a=rsa-sha256; cv=none; b=q22aXTyBuWg3FYjaaA1qEWOiB+FDCY4d0WJZlQLWybEeCotuhG+9+gGazhoZNwebSGCRXC Prz57vnd0WM/ETwIY2QY7ntoRsa0xfNJeW3wpVvbAwuSPWTt5+Jih1WhA583s9oJsZNy29 FNFv3drh5uL9AoWF3D8FNqnemyKySWLIZPMRIEZTC84rlU7mEr0PsSsm9KZACo74ELtfxD snk1L0TsalSz/axqWkHnpWqJHmZBB554quorgBy+OL5knWdhH1RIZtcdg4DX+/zJ5krhym Tq4TZzdPk2NNJ+c1aJ+lyesSYnFytlUi9K7QcNnt773H4DDYCQEmOpuxbVLp2g== 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 4ZtXYn0wNmz19B; Thu, 08 May 2025 13:10:37 +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 548DAbv6046723; Thu, 8 May 2025 13:10:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 548DAbji046720; Thu, 8 May 2025 13:10:37 GMT (envelope-from git) Date: Thu, 8 May 2025 13:10:37 GMT Message-Id: <202505081310.548DAbji046720@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: 75568c61bfdd - main - pf: add missing braces 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: 75568c61bfdd512e6ebef6a2024774e7bd70d23a Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=75568c61bfdd512e6ebef6a2024774e7bd70d23a commit 75568c61bfdd512e6ebef6a2024774e7bd70d23a Author: Kristof Provost AuthorDate: 2025-05-05 14:08:03 +0000 Commit: Kristof Provost CommitDate: 2025-05-08 13:10:24 +0000 pf: add missing braces 4e5657ab346c9 added assertions here, which caused us to always execute PACKET_UNDO_NAT(), even when that's not needed. Add braces to ensure we execute only when expected. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 8c74b15ef991..39aa965a2d29 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -9073,11 +9073,12 @@ pf_route(struct mbuf **m, struct pf_krule *r, struct ifnet *oifp, error = EMSGSIZE; KMOD_IPSTAT_INC(ips_cantfrag); if (pd->act.rt != PF_DUPTO) { - if (s && s->nat_rule != NULL) + if (s && s->nat_rule != NULL) { MPASS(m0 == pd->m); PACKET_UNDO_NAT(pd, (ip->ip_hl << 2) + (ip_off & IP_OFFMASK), s); + } icmp_error(m0, ICMP_UNREACH, ICMP_UNREACH_NEEDFRAG, 0, ifp->if_mtu); @@ -9359,11 +9360,12 @@ pf_route6(struct mbuf **m, struct pf_krule *r, struct ifnet *oifp, else { in6_ifstat_inc(ifp, ifs6_in_toobig); if (pd->act.rt != PF_DUPTO) { - if (s && s->nat_rule != NULL) + if (s && s->nat_rule != NULL) { MPASS(m0 == pd->m); PACKET_UNDO_NAT(pd, ((caddr_t)ip6 - m0->m_data) + sizeof(struct ip6_hdr), s); + } icmp6_error(m0, ICMP6_PACKET_TOO_BIG, 0, ifp->if_mtu); SDT_PROBE1(pf, ip6, route_to, drop, __LINE__);