Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't call pfxlist_onlink_check with holding llentry lock 

From FreeBSD (as of 2016-04-11).

Should fix PR kern/51060.
This commit is contained in:
ozaki-r 2016-04-11 01:16:20 +00:00
parent 0594af8028
commit dd3c4fc3e5
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/netinet6/nd6_nbr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nd6_nbr.c,v 1.115 2016/04/04 07:37:07 ozaki-r Exp $ */
/* $NetBSD: nd6_nbr.c,v 1.116 2016/04/11 01:16:20 ozaki-r Exp $ */
/* $KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $ */
/*
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.115 2016/04/04 07:37:07 ozaki-r Exp $");
__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.116 2016/04/11 01:16:20 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@ -547,6 +547,7 @@ nd6_na_input(struct mbuf *m, int off, int icmp6len)
union nd_opts ndopts;
struct sockaddr_in6 ssin6;
int rt_announce;
bool checklink = false;
if (ip6->ip6_hlim != 255) {
nd6log(LOG_ERR,
@ -675,7 +676,7 @@ nd6_na_input(struct mbuf *m, int off, int icmp6len)
* non-reachable to probably reachable, and might
* affect the status of associated prefixes..
*/
pfxlist_onlink_check();
checklink = true;
}
} else {
int llchange;
@ -808,6 +809,9 @@ nd6_na_input(struct mbuf *m, int off, int icmp6len)
if (ln != NULL)
LLE_WUNLOCK(ln);
if (checklink)
pfxlist_onlink_check();
m_freem(m);
return;