From nobody Thu Sep 12 19:16:37 2024 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 4X4Rxy265nz5WZ62; Thu, 12 Sep 2024 19:16:38 +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 4X4Rxx73Blz4p1w; Thu, 12 Sep 2024 19:16:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726168598; 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=vqGqRWQ87pK0veGshm4epqnuXCuey9NEvP1JLMe5PJQ=; b=I262ZWxeoZzP3ECDtdOI6MXBSLFzBzCeJ1uM+6/vSQ6AnvgGL3+pWAtoesfC25ssOqd67R Akr4iaCYj9XbQl5tvygJfLywTzWgE//Hp4EZBBSW/tnXPTSKihaAyJLv4+JqIlVcRq/j2L LhOfKViHxJbsNhJA2zqyj8VWOIBiLo+uWfJcI6sOjvR+VCZ7pK2joRbHwi/StEmAgpiAfX 16J23b3o+Z2zOqzGEu14b0K/VknKtO/fIdab25Nn+WG4q2QEKgbvQpF/x+618RGcA+ENhL zxonCCFQjsRAPKfSvEfL8221dhMXOWNp8z3+ZKFIwqKC+LUN05kl64j6r7xzUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726168598; a=rsa-sha256; cv=none; b=AgmcZpFEimBN+69sRNvEZmjWkIBD62C7Tpv1lxjqOBmJZrrr9R2gsJe5IIvavSMPv/nvZE xiuRhDqIEktmrF/NmJTmbAfg12gIyjiqoj2d7YpnAOOKXzPJX5js8vCwR2tqm8emIbu84/ hIt8/1fdXW5v/746cu3F/Obr/Ddudzzw0Gzfvj7CJFHSfBkWGyVDi/89Ov6gofqQZ32i7x jdkTxhFjc1JyFGZ1jSYTkQkbsfaZi5eWSAY4HLjt9wkFPPHaHvTVu3fKxFlFG5GmM0ED+I VmUhTGbF5M3fpAzwFd04Cf8K07xnAB2moaF20t3FiOFX9Ijx75wRiAoUWfIeCw== 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=1726168598; 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=vqGqRWQ87pK0veGshm4epqnuXCuey9NEvP1JLMe5PJQ=; b=Y+pGA7N5f5rncVGSpoO02GkAbdGIqMTGTY1EmbRanFCN2kVbWDehDd5g471edUN7V3VrXr pozEYch6CzNLOtzgLUa/WP4YjuLbMTUcHj7Y4Rt7zn5sDBZGLflMLX6+ZWVP8h0AyKr/9g Lcb8z2vmQAa2madBYZ7yzAWIvOiI0N07fnJCSo/rVY7UCx1AGqwdGhjMYTl+ZLw0Ixpsft udFe2sSXiF6klQXsyipvM7MM5mrXQjVhpq/3AsimCjiLG/GgEqjM/hNk/pFUavylv4euuT +3uIC8q1+zkQwzL2BXb1/Dq4jG86JH26VsEuhEugEqmkoJmgdhZ2s10CKOFpvA== 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 4X4Rxx6XkWz1QtL; Thu, 12 Sep 2024 19:16: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 48CJGbVZ030903; Thu, 12 Sep 2024 19:16:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48CJGbUl030900; Thu, 12 Sep 2024 19:16:37 GMT (envelope-from git) Date: Thu, 12 Sep 2024 19:16:37 GMT Message-Id: <202409121916.48CJGbUl030900@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eugene Grosbein Subject: git: becd0079c052 - main - ng_ipfw(4): add missing change after previous commit 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: eugen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: becd0079c052cb87e7649b78733b99abae8861ee Auto-Submitted: auto-generated The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=becd0079c052cb87e7649b78733b99abae8861ee commit becd0079c052cb87e7649b78733b99abae8861ee Author: Eugene Grosbein AuthorDate: 2024-09-12 19:09:28 +0000 Commit: Eugene Grosbein CommitDate: 2024-09-12 19:09:28 +0000 ng_ipfw(4): add missing change after previous commit The function ng_ipfw_input() used to enjoy implicit 32->16 bits truncation of its second argument. Make it explicit to recover from the breakage. PR: 281082 Reported by: Ruben van Staveren Tested by: Ruben van Staveren MFC after: 3 days Fixes: 20e1f207cc789a28783344614d6d1d1c639c5797 --- 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 */ /*