git: 784817824bb4 - stable/13 - ng_ipfw(4): add missing change after previous commit
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 18 Sep 2024 08:14:38 UTC
The branch stable/13 has been updated by eugen:
URL: https://cgit.FreeBSD.org/src/commit/?id=784817824bb4447eeda21f9ed55340def93deb29
commit 784817824bb4447eeda21f9ed55340def93deb29
Author: Eugene Grosbein <eugen@FreeBSD.org>
AuthorDate: 2024-09-12 19:09:28 +0000
Commit: Eugene Grosbein <eugen@FreeBSD.org>
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 <ruben@verweg.com>
Tested by: Ruben van Staveren <ruben@verweg.com>
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 */
/*