From 551285191e25159705e99dbcf30b95ab0d92f29e Mon Sep 17 00:00:00 2001 From: rwatson Date: Mon, 7 Jul 2008 09:26:52 +0000 Subject: [PATCH] Drop read lock on udbinfo earlier during delivery to the last matching UDP socket for a datagram; the inpcb read lock is sufficient to provide inpcb stability during udp_append(). MFC after: 1 month --- sys/netinet/udp_usrreq.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 4479a50dcb16..f63fd0b702b0 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -542,11 +542,13 @@ udp_input(struct mbuf *m, int off) * Check the minimum TTL for socket. */ INP_RLOCK(inp); - if (inp->inp_ip_minttl && inp->inp_ip_minttl > ip->ip_ttl) - goto badheadlocked; + INP_INFO_RUNLOCK(&udbinfo); + if (inp->inp_ip_minttl && inp->inp_ip_minttl > ip->ip_ttl) { + INP_RUNLOCK(inp); + goto badunlocked; + } udp_append(inp, ip, m, iphlen + sizeof(struct udphdr), &udp_in); INP_RUNLOCK(inp); - INP_INFO_RUNLOCK(&udbinfo); return; badheadlocked: