From nobody Wed Sep 18 08:14:38 2024 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 4X7rzM0L8Nz5WZp2; Wed, 18 Sep 2024 08:14:39 +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 4X7rzL6mVLz4HZH; Wed, 18 Sep 2024 08:14:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726647279; 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=8oMYjc++B3SDTxwleHTgFJRkvP9dm+6zDS0valSRdxE=; b=rEcQTRz18GPwDf77AtNSwKkQ5ofqMpBjLdoESyT8XNhp5D0tlbcNzUXeNPpq5wlEy4uGL1 TSujmbfjfFGcdFoKnvDhRBT4HJV5IsIu9/MvozHsqSQX8hYK5rdb6W6TwlWOj/Y1Yp17D0 LkeD8iLhONkoobiEzSDooxcJshukipvbNDbR8sKwBLMRN+Xg+zWPWqNHP7jIsob5IwNbhF SnQ7HyXmQ0VqbsEDTMzQpXRnYTOHetvt7sLohY9OqrG2rFnieP33LnElOyK2U5DjymP/yP jhQVeGO3HCR/dWrig8BNyGsvWWEThRKQRUBsHyghwhwuJ/4H42dgJef0A7LBrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726647278; a=rsa-sha256; cv=none; b=QSmg/IBVJFdk7ftLegIuDtlb8JPyVsdb53jbTtVVdvnTTnZnZQNyTdxEhuyy4jwTmOYpD3 PjjQ6C9/tXWOUO1C2wIbu074VQ5ovkeuI+a8DfXTa5yT1jdAYZ/kII7Ife7MD5HEjDM0x9 VbLGTirvJrcnWWhOEgCmgQzVNl0k6F/zlJUD31ifOs8atN6Qrg3c7AB1Xmb2JezaQMucvn r6gkWrzbpSmqiEr2flOhfbnfd/xyFQ3Qy47xZwQbTFGZKOY3XnXY0V6SyCIP7nSZgc8qZ8 QZD3v9OIJkrL4ocFxZjaIv/e0hYxBd4DxKlM+PDoyLhkUaiUFAxtNd8TvxEFZQ== 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=1726647278; 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=8oMYjc++B3SDTxwleHTgFJRkvP9dm+6zDS0valSRdxE=; b=rum6KjnpiVOk+piTnKPKDxl25pe5DMcCcrD9fbtot3cJ/hI389E6RX03FnyVj5mD6Lj+wD +0W4Cpl/YyF03IlGwVOPTkK1suhPfbpqSpSyQx6wj6+YoLtojdP162hwUhohEZo6SAi0Qz WbJhF4hJ5ti/YbRNzUT526mYL2hQ8aYi9hrPyJ96+0L6exX/hVf5tSpcm8G4U6m6Aq5Fde oaZwlP7ZMP57VMvgRDIjNQLixYpdHfezmQaYT2KMJzg9ZHJxLJLzD09koMbzlgXzr8UIDD beUsNpdutr9Pr1U+HzGGtxZ2e6d9jPz1jy8b4D0Q6tQWeK1lhpjf5t7KKmEIIA== 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 4X7rzL6MxDzF5J; Wed, 18 Sep 2024 08:14:38 +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 48I8EcBY057229; Wed, 18 Sep 2024 08:14:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48I8EcIk057226; Wed, 18 Sep 2024 08:14:38 GMT (envelope-from git) Date: Wed, 18 Sep 2024 08:14:38 GMT Message-Id: <202409180814.48I8EcIk057226@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: 784817824bb4 - stable/13 - ng_ipfw(4): add missing change after previous commit 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: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 784817824bb4447eeda21f9ed55340def93deb29 Auto-Submitted: auto-generated The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=784817824bb4447eeda21f9ed55340def93deb29 commit 784817824bb4447eeda21f9ed55340def93deb29 Author: Eugene Grosbein AuthorDate: 2024-09-12 19:09:28 +0000 Commit: Eugene Grosbein CommitDate: 2024-09-18 08:14:06 +0000 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 */ /*