privsep: fix crash when interface departs before bpf returns for it

2 files changed, 7 insertions, 0 deletions

diff --git a/src/dhcp.c b/src/dhcp.c
index 61cc256a..923c5af5 100644
--- a/src/dhcp.c
+++ b/src/dhcp.c
@@ -3477,6 +3477,9 @@ dhcp_packet(struct interface *ifp, uint8_t *data, size_t len,
 #ifdef PRIVSEP
 	const struct dhcp_state *state = D_CSTATE(ifp);
 
+	if (state == NULL)
+		return;
+
 	/* Ignore double reads */
 	if (IN_PRIVSEP(ifp->ctx)) {
 		switch (state->state) {
diff --git a/src/privsep-bpf.c b/src/privsep-bpf.c
index f7662333..f8240f12 100644
--- a/src/privsep-bpf.c
+++ b/src/privsep-bpf.c
@@ -266,6 +266,10 @@ ps_bpf_dispatch(struct dhcpcd_ctx *ctx,
 	size_t bpf_len;
 
 	ifp = if_findindex(ctx->ifaces, psm->ps_id.psi_ifindex);
+	/* interface may have departed .... */
+	if (ifp == NULL)
+		return -1;
+
 	bpf = iov->iov_base;
 	bpf_len = iov->iov_len;