D51505.1783711918.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D51505.1783711918.diff
View Options

	diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
	--- a/sys/netinet/udp_usrreq.c
	+++ b/sys/netinet/udp_usrreq.c
	@@ -243,7 +243,6 @@
	struct sockaddr_in6 udp_in6;
	#endif
	struct udpcb *up;
	- bool filtered;

	INP_LOCK_ASSERT(inp);

	@@ -252,13 +251,19 @@
	*/
	up = intoudpcb(inp);
	if (up->u_tun_func != NULL) {
	+ bool filtered;
	+
	in_pcbref(inp);
	INP_RUNLOCK(inp);
	filtered = (up->u_tun_func)(n, off, inp, (struct sockaddr )&udp_in[0],
	up->u_tun_ctx);
	INP_RLOCK(inp);
	- if (filtered)
	- return (in_pcbrele_rlocked(inp));
	+ if (in_pcbrele_rlocked(inp))
	+ return (1);
	+ if (filtered) {
	+ INP_RUNLOCK(inp);
	+ return (1);
	+ }
	}

	off += sizeof(struct udphdr);
	diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c
	--- a/sys/netinet6/udp6_usrreq.c
	+++ b/sys/netinet6/udp6_usrreq.c
	@@ -142,7 +142,6 @@
	struct socket *so;
	struct mbuf opts = NULL, tmp_opts;
	struct udpcb *up;
	- bool filtered;

	INP_LOCK_ASSERT(inp);

	@@ -151,13 +150,19 @@
	*/
	up = intoudpcb(inp);
	if (up->u_tun_func != NULL) {
	+ bool filtered;
	+
	in_pcbref(inp);
	INP_RUNLOCK(inp);
	filtered = (*up->u_tun_func)(n, off, inp,
	(struct sockaddr *)&fromsa[0], up->u_tun_ctx);
	INP_RLOCK(inp);
	- if (filtered)
	- return (in_pcbrele_rlocked(inp));
	+ if (in_pcbrele_rlocked(inp))
	+ return (1);
	+ if (filtered) {
	+ INP_RUNLOCK(inp);
	+ return (1);
	+ }
	}

	off += sizeof(struct udphdr);