system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-06 00:20:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not obtain an already held read lock. This causes a witness panic when

Browse source 
ipfs is invoked. This is the second of two panics resolving PR 235110.

PR:		235110
Reported by:	David.Boyd49@twc.com
MFC after:	2 weeks
This commit is contained in:
Cy Schubert 2019-01-30 20:23:16 +00:00
parent b63abbf63a
commit b403765e8c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=343591
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sys/contrib/ipfilter/netinet/ip_nat.c
View file

@ -1904,21 +1904,17 @@ ipf_nat_getent(softc, data, getlock)
}
}
if (error == 0) {
if (getlock) {
READ_ENTER(&softc->ipf_nat);
getlock = 0;
}
error = ipf_outobjsz(softc, data, ipn, IPFOBJ_NATSAVE,
ipns.ipn_dsize);
}
finished:
if (getlock) {
READ_ENTER(&softc->ipf_nat);
}
if (ipn != NULL) {
KFREES(ipn, ipns.ipn_dsize);
}
if (getlock) {
RWLOCK_EXIT(&softc->ipf_nat);
}
return error;
}