From 2d23f13f7f4cdaadb7247c2f0597e503d6035508 Mon Sep 17 00:00:00 2001 From: rwatson Date: Sun, 31 Aug 2008 13:16:45 +0000 Subject: In UDPv6, reduce scope of global udbinfo lock during append to last matching socket by dropping it before udp6_append(), and remove duplicate unlocks of udbinfo and inpcb in sysctl return path. MFC after: 3 days --- sys/netinet6/udp6_usrreq.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'sys/netinet6') diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index f593e6f..fa943d5 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -308,9 +308,9 @@ udp6_input(struct mbuf **mp, int *offp, int proto) goto badheadlocked; } INP_RLOCK(last); + INP_INFO_RUNLOCK(&V_udbinfo); udp6_append(last, m, off, &fromsa); INP_RUNLOCK(last); - INP_INFO_RUNLOCK(&V_udbinfo); return (IPPROTO_DONE); } /* @@ -465,8 +465,6 @@ udp6_getcred(SYSCTL_HANDLER_ARGS) INP_INFO_RUNLOCK(&V_udbinfo); error = ENOENT; } - INP_RUNLOCK(inp); - INP_INFO_RUNLOCK(&V_udbinfo); if (error == 0) error = SYSCTL_OUT(req, &xuc, sizeof(struct xucred)); return (error); -- cgit v1.1