wireguardif: Fix output filter error path.

rtrbt · rtrbt · commit 4d0534a91899 · 2024-10-11T10:03:38.000+02:00
diff --git a/src/wireguardif.c b/src/wireguardif.c
@@ -205,9 +205,11 @@ static err_t wireguardif_output(struct netif *netif, struct pbuf *q, const ip4_a
 	ip_addr_copy_from_ip4(ipaddr, *ip4addr);
 	struct wireguard_peer *peer = peer_lookup_by_allowed_ip(device, &ipaddr);
 	if (peer) {
-		if (device->out_filter_fn == NULL || device->out_filter_fn(q) == 0) {
-			return wireguardif_output_to_peer(netif, q, &ipaddr, peer);
+		int filter_err = device->out_filter_fn == NULL ? 0 : device->out_filter_fn(q);
+		if (filter_err != 0) {
+			return filter_err;
 		}
+		return wireguardif_output_to_peer(netif, q, &ipaddr, peer);
 	} else {
 		return ERR_RTE;
 	}

Original file line number	Diff line number	Diff line change
`@@ -205,9 +205,11 @@ static err_t wireguardif_output(struct netif netif, struct pbuf q, const ip4_a`
`205`	`205`	`ip_addr_copy_from_ip4(ipaddr, *ip4addr);`
`206`	`206`	`struct wireguard_peer *peer = peer_lookup_by_allowed_ip(device, &ipaddr);`
`207`	`207`	`if (peer) {`
`208`		`- if (device->out_filter_fn == NULL \|\| device->out_filter_fn(q) == 0) {`
`209`		`- return wireguardif_output_to_peer(netif, q, &ipaddr, peer);`
	`208`	`+ int filter_err = device->out_filter_fn == NULL ? 0 : device->out_filter_fn(q);`
	`209`	`+ if (filter_err != 0) {`
	`210`	`+ return filter_err;`
`210`	`211`	`}`
	`212`	`+ return wireguardif_output_to_peer(netif, q, &ipaddr, peer);`
`211`	`213`	`} else {`
`212`	`214`	`return ERR_RTE;`
`213`	`215`	`}`