From nobody Wed Feb 12 19:39:03 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 4YtTCC5tFlz5nGbd; Wed, 12 Feb 2025 19:39:03 +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 4YtTCC3ksRz3XkH; Wed, 12 Feb 2025 19:39:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739389143; 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=MJkeZbuHBzvOkKLhYLtkz5I7OFE6qCvQ1yggBwggMdk=; b=H7jwFBygm6EtOHZjdWHew+sK4LRjxUBQN/4RZ9CFl3/ALbdrmktqZiBkoyI9klEE+ze07o +dtm+mP2DnFb5g41dXVu3Zq4u+DYs4gKZWbXYnIX+ZbwabDh+NwVz5wQZ3P/bpXEd6UJrV zjZhISh1eqQTrtxLZcyBNU5t/cBJ7D7OQxNfmGiEIV+drRiuM4pGO4BeqEzE/vF4xiPvZs SSHOaJyIP+fyEPQnrfed+zarSKfPA3sjCTBmHtcToIM5kt9DVG2fn0WqNuod7KxIsT60XQ jTgT+PEkqJiUk+ts+8kE3tX3stmOP0U5YP/zIKriEinN+8jF/TtBG9OpqrMz2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739389143; 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=MJkeZbuHBzvOkKLhYLtkz5I7OFE6qCvQ1yggBwggMdk=; b=wvUsxejFRRGdD0lABglgDRVg8R1mF1dtxryE7VXQuRIRC2t0/EquoLj7uX1etEJ8CMHQAk OQcAcHYOjrbHAH/kjLs2MuSEV7g++9fyVxZjyDn6rAWbY+HJd51fzOAofXt/YtnfWsfoRW 13Cl5bcCEs1p33+iwyJ5Qmk3AiYFPHqPFb9tZKrB3VJffe5q+FO7lFXjnUKqV6pu26bpfE gCKNctBV6U+rCBVBDKIHhqI4mFvj7U3ziVx5YbGzWPZ7oeC/oIDAOV6kft3F0kOl7temRM g2oaoxp/mUaZn7krzcMPl6tzv6Pqxk8Zs65vx+Q0dL6mVNzOHy2D0fvDy+ICuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739389143; a=rsa-sha256; cv=none; b=x8eo+kXo6TjXWt+P7ll8gDANuC/QLyKqcP46qlrhuDlJbT72tVtSWfXnBUY/nULfas7eRw Z3Y5ogp4Nd9UyU5hLpqQ0uXk66IWAhjkS3Q2J24x7K+B4kMJ1FWyQlJaAx23sHfyxSIJdX SvX2lUC4qZkyuEk9yYY7G0lLvv4a7YwXXVN5mS/4JfChkXKZPGyOG9RHVhO9HVxs4Oglac O8wLXqU/GsB0WAMYelgNN2cvOTjE4YUIfG2NGUHe3tqXj0IumlRnwAz+BinOoJWulEFuzQ AlU4iHzendj/eRUI6qtySDESAcNm/jM4OqV6x3opL8atTwhtr9dcBXfx3NDXUg== 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 4YtTCC3KR3z1Bsv; Wed, 12 Feb 2025 19:39:03 +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 51CJd3KD061541; Wed, 12 Feb 2025 19:39:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51CJd3Nf061538; Wed, 12 Feb 2025 19:39:03 GMT (envelope-from git) Date: Wed, 12 Feb 2025 19:39:03 GMT Message-Id: <202502121939.51CJd3Nf061538@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: afc32641e293 - main - pf: make pf_change_ap() usable without a port 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: afc32641e2932d2f7c47d2fbcfde9a063e72b85b Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=afc32641e2932d2f7c47d2fbcfde9a063e72b85b commit afc32641e2932d2f7c47d2fbcfde9a063e72b85b Author: Kristof Provost AuthorDate: 2025-02-05 16:26:13 +0000 Commit: Kristof Provost CommitDate: 2025-02-12 19:38:37 +0000 pf: make pf_change_ap() usable without a port If the port pointer is NULL, just return after being done with the address. ok bluhm ryan mikeb Obtained from: OpenBSD, henning , 17f4816165 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 79e50be6cd13..17c23f6d4194 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -3217,7 +3217,7 @@ pf_change_ap(struct mbuf *m, struct pf_addr *a, u_int16_t *p, u_int16_t *ic, sa_family_t af, sa_family_t naf) { struct pf_addr ao; - u_int16_t po = *p; + u_int16_t po; PF_ACPY(&ao, a, af); if (af == naf) @@ -3226,6 +3226,9 @@ pf_change_ap(struct mbuf *m, struct pf_addr *a, u_int16_t *p, u_int16_t *ic, if (m->m_pkthdr.csum_flags & (CSUM_DELAY_DATA | CSUM_DELAY_DATA_IPV6)) *pc = ~*pc; + if (p == NULL) /* no port -> done. no cksum to worry about. */ + return; + po = *p; *p = pn; switch (af) {