Attachment 202644 Details for Bug 236292 – Proposed patch (for stable/12)

[patch] Proposed patch (for stable/12)

ipfw.diff (text/plain), 1.20 KB, created by Andrey V. Elsukov on 2019-03-06 09:01:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrey V. Elsukov

Created: 2019-03-06 09:01:39 UTC

Size: 1.20 KB

patch

obsolete

>Index: sys/netpfil/ipfw/ip_fw_dynamic.c
>===================================================================
>--- sys/netpfil/ipfw/ip_fw_dynamic.c	(revision 344840)
>+++ sys/netpfil/ipfw/ip_fw_dynamic.c	(working copy)
>@@ -1869,11 +1869,13 @@ dyn_install_state(const struct ipfw_flow_id *pkt,
>     uint16_t kidx, uint8_t type)
> {
> 	struct ipfw_flow_id id;
>-	uint32_t hashval, parent_hashval;
>+	uint32_t hashval, parent_hashval, ruleid, rulenum;
> 	int ret;
> 
> 	MPASS(type == O_LIMIT || type == O_KEEP_STATE);
> 
>+	ruleid = rule->id;
>+	rulenum = rule->rulenum;
> 	if (type == O_LIMIT) {
> 		/* Create masked flow id and calculate bucket */
> 		id.addr_type = pkt->addr_type;
>@@ -1928,11 +1930,11 @@ dyn_install_state(const struct ipfw_flow_id *pkt,
> 
> 	hashval = hash_packet(pkt);
> 	if (IS_IP4_FLOW_ID(pkt))
>-		ret = dyn_add_ipv4_state(rule, rule->id, rule->rulenum, pkt,
>+		ret = dyn_add_ipv4_state(rule, ruleid, rulenum, pkt,
> 		    ulp, pktlen, hashval, info, fibnum, kidx, type);
> #ifdef INET6
> 	else if (IS_IP6_FLOW_ID(pkt))
>-		ret = dyn_add_ipv6_state(rule, rule->id, rule->rulenum, pkt,
>+		ret = dyn_add_ipv6_state(rule, ruleid, rulenum, pkt,
> 		    zoneid, ulp, pktlen, hashval, info, fibnum, kidx, type);
> #endif /* INET6 */
> 	else

Actions: View | Diff

Attachments on bug 236292: 202644