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

Plug a lock leak in sysctl_ifmalist().

Browse Source 
Fix style in the local variable declarations.

PR:		214542
MFC after:	1 week
This commit is contained in:
markj 2016-11-15 19:23:48 +00:00
parent 36a9f10563
commit 8164292c0e
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/net/rtsock.c
View File

@ -1773,13 +1773,15 @@ done:
static int
sysctl_ifmalist(int af, struct walkarg *w)
{
struct ifnet *ifp;
struct ifmultiaddr *ifma;
struct rt_addrinfo info;
int len, error = 0;
struct rt_addrinfo info;
struct ifaddr *ifa;
struct ifmultiaddr *ifma;
struct ifnet *ifp;
int error, len;
error = 0;
bzero((caddr_t)&info, sizeof(info));
IFNET_RLOCK_NOSLEEP();
TAILQ_FOREACH(ifp, &V_ifnet, if_link) {
if (w->w_arg && w->w_arg != ifp->if_index)
@ -1799,7 +1801,7 @@ sysctl_ifmalist(int af, struct walkarg *w)
ifma->ifma_lladdr : NULL;
error = rtsock_msg_buffer(RTM_NEWMADDR, &info, w, &len);
if (error != 0)
goto done;
break;
if (w->w_req && w->w_tmem) {
struct ifma_msghdr *ifmam;
@ -1808,15 +1810,14 @@ sysctl_ifmalist(int af, struct walkarg *w)
ifmam->ifmam_flags = 0;
ifmam->ifmam_addrs = info.rti_addrs;
error = SYSCTL_OUT(w->w_req, w->w_tmem, len);
if (error) {
IF_ADDR_RUNLOCK(ifp);
goto done;
}
if (error != 0)
break;
}
}
IF_ADDR_RUNLOCK(ifp);
if (error != 0)
break;
}
done:
IFNET_RUNLOCK_NOSLEEP();
return (error);
}