d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[udp] fix possible mbuf and lock leak in udp_input().

Browse Source 
In error case we can leave `inp' locked, also we need to free
mbuf chain `m' in the same case. Release the lock and use `badunlocked'
label to exit with freed mbuf. Also modify UDP error statistic to
match the IPv6 code.

Remove redundant INP_RUNLOCK() from the `if (last == NULL)' block,
there are no ways to reach this point with locked `inp'.

Obtained from:	Yandex LLC
MFC after:	3 days
Sponsored by:	Yandex LLC
This commit is contained in:
Andrey V. Elsukov 2021-02-11 11:55:39 +03:00
parent 3c782d9c91
commit c6ded47d0b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/netinet/udp_usrreq.c
View File

@ -610,9 +610,11 @@ udp_input(struct mbuf **mp, int *offp, int proto)
uh); uh);
if (udp_append(last, ip, n, iphlen, if (udp_append(last, ip, n, iphlen,
udp_in)) { udp_in)) {
goto inp_lost; INP_RUNLOCK(inp);
goto badunlocked;
} }
} }
/* Release PCB lock taken on previous pass. */
INP_RUNLOCK(last); INP_RUNLOCK(last);
} }
last = inp; last = inp;
@ -635,9 +637,11 @@ udp_input(struct mbuf **mp, int *offp, int proto)
* to send an ICMP Port Unreachable for a broadcast * to send an ICMP Port Unreachable for a broadcast
* or multicast datgram.) * or multicast datgram.)
*/ */
UDPSTAT_INC(udps_noportbcast); UDPSTAT_INC(udps_noport);
if (inp) if (IN_MULTICAST(ntohl(ip->ip_dst.s_addr)))
INP_RUNLOCK(inp); UDPSTAT_INC(udps_noportmcast);
else
UDPSTAT_INC(udps_noportbcast);
goto badunlocked; goto badunlocked;
} }
if (proto == IPPROTO_UDPLITE) if (proto == IPPROTO_UDPLITE)
@ -646,7 +650,6 @@ udp_input(struct mbuf **mp, int *offp, int proto)
UDP_PROBE(receive, NULL, last, ip, last, uh); UDP_PROBE(receive, NULL, last, ip, last, uh);
if (udp_append(last, ip, m, iphlen, udp_in) == 0) if (udp_append(last, ip, m, iphlen, udp_in) == 0)
INP_RUNLOCK(last); INP_RUNLOCK(last);
inp_lost:
return (IPPROTO_DONE); return (IPPROTO_DONE);
} }