From nobody Wed Feb 26 22:41:20 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 4Z38b51mFNz5p5fw; Wed, 26 Feb 2025 22:41: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z38b46lnpz41Yt; Wed, 26 Feb 2025 22:41:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740609680; 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=J39RPAQ/83tildPh9qI29Wz+rnkhul14M8E9w2eG2Ec=; b=V42Fbjw2cYcRA4WVEiCUZBRah4j4zqAqW7wycDAwyzVcXgscPNyXmKJuW34dSsV7ql2Pn4 UFsovoqUVutbag7xYFTdmDV4FI7+1Vxyt7ZzDUrnBJlBe3t2GBvODxbCatwXyHhpxX4zmr C0JH4gL7pj8EYPw/m+6/XLyQHMS1lus43VDtcD80VoW+6Na5w7SQJPRgWAaHjrmRRdD1cW U9IlO8zrhxJeDD8jbXVbEUbLTK/tdQdJAi4YNA3JQDcXT/Xf/2PoCuwzgyv7A93rnnYtz4 hu1tGIXiaFb78Hoa4lDk2/jW+l+hGAXlG4/6KauNpdBp6ehF036KT2HtPfZ32A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740609680; a=rsa-sha256; cv=none; b=F8lwkJqkB02AbyUpuhf8peGu79E19HqMChLyqKtrepjAxha1OVyfaWOCFR5ZytJu2cUaVR RirH/tdJSw4v/yYXmkprS3/bUaqQ9L9UUTJpmmc3ofOK/zmb18sY+AeUFVSFE5qv0YYoK9 ZgSkVgnU+Bpc6SkvVA9Ds+7COXwMT50RCNQFO3JyN0aAccU+4A4WyEndgzxMAZq9domCSP Ngr3DML3jdjKl/TLoMF/QZ5Y8+5ehyDUaK/kOyRSEV1dxCDxdCjlNJPXbgyr0OA0L7B/EH LJ2Io80GprIyyKp5UcMn0zCjP0MJUqFk0dGvvUmEBuh1DS6v8MWfyjXg8I7cZg== 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=1740609680; 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=J39RPAQ/83tildPh9qI29Wz+rnkhul14M8E9w2eG2Ec=; b=bKa6Mmq6JWVhUrTbAgp6NBsMewZ7qGfk4k9xmLyPQ5ujULwtGTZJOpRqwCWHgRLNRGkpjP gkV+pXWtW+lRNr/kLbB62JtVyKYRtk/PJ4dSgahROS/KVerObJQeujqdh9na9P9eFFbbOr WyOJukB9+W4HSWLe6twULGduA4eeR/yxznnL1Kf2Wib+64CcHe/LiQLQLhpKDow6I9hR0k 8cIlepVF3s+I5lpbqz+uLpx1eTfnmcDgY6G9lkAkfzZKGTXAJBpAXFUV/6RxjI8h8JIgOV 8sf+curORmlOiTsgrTvwZpFjJN6hrhvcZhxJj+VnYnOqyUoZ762quI++vjvHcQ== 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 4Z38b46DSrz1Sx; Wed, 26 Feb 2025 22:41:20 +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 51QMfKLk067780; Wed, 26 Feb 2025 22:41:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51QMfKJc067777; Wed, 26 Feb 2025 22:41:20 GMT (envelope-from git) Date: Wed, 26 Feb 2025 22:41:20 GMT Message-Id: <202502262241.51QMfKJc067777@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: 8a85584785e3 - main - pf: fix incorrect calls to pf_translate_icmp_af() 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: 8a85584785e3135f00a6d42e642f0e7ccee4f0f5 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=8a85584785e3135f00a6d42e642f0e7ccee4f0f5 commit 8a85584785e3135f00a6d42e642f0e7ccee4f0f5 Author: Kristof Provost AuthorDate: 2025-02-26 16:22:25 +0000 Commit: Kristof Provost CommitDate: 2025-02-26 22:40:40 +0000 pf: fix incorrect calls to pf_translate_icmp_af() The 'iih' argument is already a pointer, pass it as is rather than its address. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index f3c9ea7a2fb1..24ddf75936de 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -8353,7 +8353,7 @@ pf_test_state_icmp(struct pf_kstate **state, struct pf_pdesc *pd, nk->af)) return (PF_DROP); pd->proto = IPPROTO_ICMPV6; - if (pf_translate_icmp_af(nk->af, &iih)) + if (pf_translate_icmp_af(nk->af, iih)) return (PF_DROP); if (virtual_type == htons(ICMP_ECHO) && nk->port[iidx] != iih->icmp_id) @@ -8465,7 +8465,7 @@ pf_test_state_icmp(struct pf_kstate **state, struct pf_pdesc *pd, nk->af)) return (PF_DROP); pd->proto = IPPROTO_ICMP; - if (pf_translate_icmp_af(nk->af, &iih)) + if (pf_translate_icmp_af(nk->af, iih)) return (PF_DROP); if (virtual_type == htons(ICMP6_ECHO_REQUEST) &&