Attachment 226498 Details for Bug 257218 – Suggested diff

[patch] Suggested diff

pf_ifnet.diff (text/plain), 1.12 KB, created by Nick Reilly on 2021-07-16 15:35:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Reilly

Created: 2021-07-16 15:35:18 UTC

Size: 1.12 KB

patch

obsolete

>diff --git a/sys/net/if.c b/sys/net/if.c
>index c85cfab19bf..cb7a010d4db 100644
>--- a/sys/net/if.c
>+++ b/sys/net/if.c
>@@ -1593,14 +1593,13 @@ _if_delgroup_locked(struct ifnet *ifp, struct ifg_list *ifgl,
> 	IFNET_WUNLOCK();
> 
> 	epoch_wait_preempt(net_epoch_preempt);
>+	EVENTHANDLER_INVOKE(group_change_event, groupname);
> 	if (freeifgl) {
> 		EVENTHANDLER_INVOKE(group_detach_event, ifgl->ifgl_group);
> 		free(ifgl->ifgl_group, M_TEMP);
> 	}
> 	free(ifgm, M_TEMP);
> 	free(ifgl, M_TEMP);
>-
>-	EVENTHANDLER_INVOKE(group_change_event, groupname);
> }
> 
> /*
>diff --git a/sys/netpfil/pf/pf_if.c b/sys/netpfil/pf/pf_if.c
>index e941e3a79b9..970a3ab542b 100644
>--- a/sys/netpfil/pf/pf_if.c
>+++ b/sys/netpfil/pf/pf_if.c
>@@ -999,6 +999,8 @@ pfi_detach_ifnet_event(void *arg __unused, struct ifnet *ifp)
> #ifdef ALTQ
> 	pf_altq_ifnet_event(ifp, 1);
> #endif
>+	pfi_kkif_ref(kif);
>+	pfi_kkif_unref(kif);
> 	PF_RULES_WUNLOCK();
> 	NET_EPOCH_EXIT(et);
> }
>@@ -1059,6 +1061,8 @@ pfi_detach_group_event(void *arg __unused, struct ifg_group *ifg)
> 
> 	kif->pfik_group = NULL;
> 	ifg->ifg_pf_kif = NULL;
>+	pfi_kkif_ref(kif);
>+	pfi_kkif_unref(kif);
> 	PF_RULES_WUNLOCK();
> }
>

Actions: View | Diff

Attachments on bug 257218: 226498