From nobody Wed Sep 18 08:13:59 2024 X-Original-To: dev-commits-src-branches@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 4X7ryb65Kqz5WZcn; Wed, 18 Sep 2024 08:13:59 +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 4X7ryb5X61z4Gjh; Wed, 18 Sep 2024 08:13:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726647239; 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=Wpz61AzX+JN/a8vGIYbKVAuWyGbC+II4yROwy1bznMI=; b=ZhnYxxkwelZbAw6aWv1Tdf9Y87TxlWWPjUQPapYRlLbIOkQXoLnArDjGVucdWv3fJ1FG2a 4uGOid8AUz1Lc1+S5BYmTYuDQX0I3gY6IbScL3Siy7sCqltPBjN3cJPmPbIGEuLjJVg2k/ DJkjYcLUlB1rjE07bam5MhLvr+hm6+JC6S7XK1+JDEPjFflsyo6PSkfXjq88pKGrMMM9FA Kih5o/Zw/3MxfOp61biDS+ZugldVpaDEvcIw/Sy45hWcBkeKaOrXKGH3NdZ5GxvoOZDVui rdEvlD3/wi8nAnaPFlPs69Jwj6oNVt2vSJfXqkm9AIR/VCCuGhZpwvI0TK4/Kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726647239; a=rsa-sha256; cv=none; b=YSe2JfxRQtOIfHb8smwYrIfE/9t5PlKPNznB+JN/oEIy7u+XozeYBbatXaOBN+iJL+C/Bd JwmRW5dfltjkJFk+tqzeNf264sNqBu82QUjeqs3EKP4adrvbg9saiesJYlBEoVrKVVEmlb PmnTnad74xSOiXvttN4yF4o3fzdV7XAzavRVMl9Maf02xSl0diaFas1iOFTXMuXEio3V9m R25JF1wDofErdPKSeMmwu64IKROnCwdJ5uxx9AkmogY4sbeAb0MAfVtWaadFXiKjTBNdEt Q9K/qqiBjynE8WDCg45Wu0nWpmzT1X5ICp0lMfvNlk0W+RDp4ssxAd/ekzVmYA== 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=1726647239; 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=Wpz61AzX+JN/a8vGIYbKVAuWyGbC+II4yROwy1bznMI=; b=MWymrdnaJraIq52kmCPuAlf/hCtoif2V9fxqJWttc5qIqxZTYuJdU/9ckvmrQyNyIMVNQT 9+7MxH9mEvt7t1lxIO02zEhQWgvkiw+v6BeRnm7rKkDk5nbgbiC8yqOn2RkHGP5BsadGVY AXS/oF7Feu938aGGKFpvVdyAQR+nynmNBWEaWls9Emq9+91vYCemWpm9Ay9UqvlezUnDyG PcCb79xzGj33stCiClCEhBXYKGYtgzvgdMyaXFlTrYEFsTwQ4L1oECDdLOfKF1Vj/XCuNC CgfPewClJ4BsI4Onp8TcsG1hoFnEZlFdZEgPepp9676nq8DramSH6sGm3+fJVA== 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 4X7ryb4f7jzDnP; Wed, 18 Sep 2024 08:13:59 +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 48I8Dxgn056969; Wed, 18 Sep 2024 08:13:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48I8Dxai056966; Wed, 18 Sep 2024 08:13:59 GMT (envelope-from git) Date: Wed, 18 Sep 2024 08:13:59 GMT Message-Id: <202409180813.48I8Dxai056966@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 5d54e2539429 - stable/14 - MFC: ng_ipfw(4): add missing change after previous commit List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5d54e2539429f348dac20428e8b5349e9d34a675 Auto-Submitted: auto-generated The branch stable/14 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=5d54e2539429f348dac20428e8b5349e9d34a675 commit 5d54e2539429f348dac20428e8b5349e9d34a675 Author: Eugene Grosbein AuthorDate: 2024-09-12 19:09:28 +0000 Commit: Eugene Grosbein CommitDate: 2024-09-18 08:12:34 +0000 MFC: ng_ipfw(4): add missing change after previous commit The function ng_ipfw_input() used to enjoy implicit 32->16 bits truncation of ng_ipfw_findhook1's second argument. Make it explicit to recover from the breakage. PR: 281082 Reported by: Ruben van Staveren Tested by: Ruben van Staveren Fixes: 20e1f207cc789a28783344614d6d1d1c639c5797 (cherry picked from commit becd0079c052cb87e7649b78733b99abae8861ee) --- sys/netgraph/ng_ipfw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netgraph/ng_ipfw.c b/sys/netgraph/ng_ipfw.c index 01592a4bbb7d..9a6bb90412fa 100644 --- a/sys/netgraph/ng_ipfw.c +++ b/sys/netgraph/ng_ipfw.c @@ -291,7 +291,7 @@ ng_ipfw_input(struct mbuf **m0, struct ip_fw_args *fwa, bool tee) * Node must be loaded and corresponding hook must be present. */ if (fw_node == NULL || - (hook = ng_ipfw_findhook1(fw_node, fwa->rule.info)) == NULL) + (hook = ng_ipfw_findhook1(fw_node, fwa->rule.info & IPFW_INFO_MASK)) == NULL) return (ESRCH); /* no hook associated with this rule */ /*