diff options
| author | glebius <glebius@FreeBSD.org> | 2010-07-01 17:46:12 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2010-07-01 17:46:12 +0000 |
| commit | f20ddfdf57e2b9a26f533913a8d39c52588d39f4 (patch) | |
| tree | 45bcbd174ab9b2b12aefcc4b56f437eb72ff13e9 | |
| parent | 9c3639722d0a2ddfe00a5db8f27bbb2ba815e80a (diff) | |
| download | FreeBSD-src-f20ddfdf57e2b9a26f533913a8d39c52588d39f4.zip FreeBSD-src-f20ddfdf57e2b9a26f533913a8d39c52588d39f4.tar.gz | |
The struct ipfw_rule_ref follows the struct m_tag. Deal with this
correctly. This fixes breakage of ng_ipfw(4) in r201527.
Submitted by: Alexander Zagrebin <alexz visp.ru>
| -rw-r--r-- | sys/netgraph/ng_ipfw.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/netgraph/ng_ipfw.c b/sys/netgraph/ng_ipfw.c index 537040a..18dd537 100644 --- a/sys/netgraph/ng_ipfw.c +++ b/sys/netgraph/ng_ipfw.c @@ -221,20 +221,21 @@ ng_ipfw_findhook1(node_p node, u_int16_t rulenum) static int ng_ipfw_rcvdata(hook_p hook, item_p item) { - struct ipfw_rule_ref *tag; + struct m_tag *tag; + struct ipfw_rule_ref *r; struct mbuf *m; NGI_GET_M(item, m); NG_FREE_ITEM(item); - tag = (struct ipfw_rule_ref *) - m_tag_locate(m, MTAG_IPFW_RULE, 0, NULL); + tag = m_tag_locate(m, MTAG_IPFW_RULE, 0, NULL); if (tag == NULL) { NG_FREE_M(m); return (EINVAL); /* XXX: find smth better */ }; - if (tag->info & IPFW_INFO_IN) { + r = (struct ipfw_rule_ref *)(tag + 1); + if (r->info & IPFW_INFO_IN) { ip_input(m); return (0); } else { |
