From nobody Wed May 28 21:55:50 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 4b73Gb6X7gz5xK3k; Wed, 28 May 2025 21:55:51 +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 4b73Gb1dBMz46xH; Wed, 28 May 2025 21:55:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748469351; 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=9xzXwF9X+dL2x+JNKC3ATEQHoxDhgdu46+lHeA+5RZs=; b=qCsMxppzgMEU1HgD9Cs+192B+CCtnhiOu0GIQOZfh92nA4PEbOshYU6TqJ7CZkBKBiJ3pn +x1eI8P2BNF6R6ei43hOMYtthlShuxQMExn4WizGqnloaZ2aMeDKkf95U5iYQiVnFAU4so SgzJVqfpna2Uup0w98B8txnip/hdZ4yH3JMyFyXWuowX4oQ+qEQuNwmtu1XW1HUEfL56lB fsBuP11DU0KC/yGSlVfPzi99gEtR8iUqzeENwz+zcXZbfctAOjvyETC4ezNdYIYVG7DTxG bawmP72zKYTz+zIxK09lbPJrdg5gfaEaKJ7HdWwu0vUQz5DHMa1mctcMSbqoDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748469351; a=rsa-sha256; cv=none; b=r+EyZwQr9QSEa0QpyLvrkuNjmnFFMyYZVXgCp53SJWYRMIR7KlaDZPZjy48A6zw5RNxmDc iYk9uw3uxqVXLmoDSSzTOCxN0xIOyK7ZwYNBvCq/DErGh6vhRvVOgsQBbUu4qzM0Ja/Ap8 4cXTsmi7iJ0eI96qcyVFoMkBwtbC86yITnTbJjqm5vu6pRrt42PZvrDSEUwO37n/QkPl7j XL3ACyn7Sye0cJf/GdRhy8pVOOWYcZCBeP8LtAoPex8CyDzR1cCQgZZP1IJeRG15NsmoD0 acd4JDuo2LodgEolHpvTqFA0+jxD73xvw2MLSEYHVXCJ2NborZKZUSA4l6U/rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748469351; 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=9xzXwF9X+dL2x+JNKC3ATEQHoxDhgdu46+lHeA+5RZs=; b=EXRgSXQQGvhdLmNatVPpLRrIQTM5i54KFIYYgTCiZrol6LLbW/9KUQY1bk0h2zGQcwpS27 fSxeyigUU0Vk9AQ5h5Qd+GZenIiGhkl39Dv6peaPB0kPEg/2lyQuBeYFOu3cN57E16NqOC ls85vznf8mC12BCOKqeI7B2x+EGuEOWhVbIjY98Rqcpx4NH232PvQ6ftQq/2Mm33TnAciF t7exLBuYIeG1cLxvKqH8P7NB6DX6Daf2XrHxkR62+CNqU9R6R/1M0bGNjtFcj64b7Z5J8w sI+di9SadFMXTtQkIuMstgcxAPIt07P/vn3INLalZt1wJnbUOOXNx7WZTTYUNw== 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 4b73GZ69gTzvXx; Wed, 28 May 2025 21:55:50 +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 54SLto5v054934; Wed, 28 May 2025 21:55:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SLtowk054931; Wed, 28 May 2025 21:55:50 GMT (envelope-from git) Date: Wed, 28 May 2025 21:55:50 GMT Message-Id: <202505282155.54SLtowk054931@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: 8801e3adff00 - main - pfctl: don't check np->port for NULL 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: 8801e3adff004f9facb16b0e3dffbf68f3ac1365 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=8801e3adff004f9facb16b0e3dffbf68f3ac1365 commit 8801e3adff004f9facb16b0e3dffbf68f3ac1365 Author: Kristof Provost AuthorDate: 2025-05-26 09:24:39 +0000 Commit: Kristof Provost CommitDate: 2025-05-28 21:40:36 +0000 pfctl: don't check np->port for NULL It's an array, it's never NULL. OK bluhm@ Obtained from: OpenBSD, akfaew , abfef119a6 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/parse.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index befa5a9b0d39..3ddf391810c6 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -6091,7 +6091,7 @@ apply_rdr_ports(struct pfctl_rule *r, struct pfctl_pool *rpool, struct redirspec rpool->proxy_port[0] = ntohs(rs->rport.a); - if (!rs->rport.b && rs->rport.t && r->dst.port != NULL) { + if (!rs->rport.b && rs->rport.t) { rpool->proxy_port[1] = ntohs(rs->rport.a) + (ntohs(r->dst.port[1]) - ntohs(r->dst.port[0])); } else