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

Fix two cases of incorrect IPQ_UNLOCK'ing in the merged ip_reass() function.

Browse Source 
The first one was going to 'dropfrag', which unlocks the IPQ, before the lock
was aquired; The second one doing a unlock and then a 'goto dropfrag' which
led to a double-unlock.

Tripped over by:	des
This commit is contained in:
Andre Oppermann 2004-08-12 08:37:42 +00:00
parent d53fc3e41c
commit 9d804f818c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=133557
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/netinet/ip_input.c
View File

@ -895,7 +895,8 @@ ip_reass(struct mbuf *m)
if (maxnipq == 0) {
ipstat.ips_fragments++;
ipstat.ips_fragdropped++;
goto dropfrag;
m_freem(m);
return (NULL);
}
ip = mtod(m, struct ip *);
@ -959,7 +960,6 @@ ip_reass(struct mbuf *m)
* that's a non-zero multiple of 8 bytes.
*/
if (ip->ip_len == 0 || (ip->ip_len & 0x7) != 0) {
IPQ_UNLOCK();
ipstat.ips_toosmall++; /* XXX */
goto dropfrag;
}