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

Massively blow up the locking-related KASSERTs used to make sure

Browse Source 
that we end up in a consistent locking state at the end of
udp_output() in order to be able to see what the values are based
on which we once took a decision (note: some values may have changed).

This helped to debug a syzkaller report.

MFC after:	2 months
Event:		Waterloo Hackathon 2019
This commit is contained in:
Bjoern A. Zeeb 2019-05-21 19:23:56 +00:00
parent f9a6e8d72f
commit bd4549f467
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=348061
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/netinet/udp_usrreq.c
View File

@ -1566,12 +1566,22 @@ udp_output(struct inpcb *inp, struct mbuf *m, struct sockaddr *addr,
release:
if (unlock_udbinfo == UH_WLOCKED) {
KASSERT(unlock_inp == UH_WLOCKED,
("%s: excl udbinfo lock, shared inp lock", __func__));
("%s: excl udbinfo lock %#03x, shared inp lock %#03x, "
"sin %p daddr %#010x inp %p laddr %#010x lport %#06x "
"src fam %#04x",
__func__, unlock_udbinfo, unlock_inp, sin,
(sin != NULL) ? sin->sin_addr.s_addr : 0xfefefefe, inp,
inp->inp_laddr.s_addr, inp->inp_lport, src.sin_family));
INP_HASH_WUNLOCK(pcbinfo);
INP_WUNLOCK(inp);
} else if (unlock_udbinfo == UH_RLOCKED) {
KASSERT(unlock_inp == UH_RLOCKED,
("%s: shared udbinfo lock, excl inp lock", __func__));
("%s: shared udbinfo lock %#03x, excl inp lock %#03x, "
"sin %p daddr %#010x inp %p laddr %#010x lport %#06x "
"src fam %#04x",
__func__, unlock_udbinfo, unlock_inp, sin,
(sin != NULL) ? sin->sin_addr.s_addr : 0xfefefefe, inp,
inp->inp_laddr.s_addr, inp->inp_lport, src.sin_family));
INP_HASH_RUNLOCK_ET(pcbinfo, et);
INP_RUNLOCK(inp);
} else if (unlock_inp == UH_WLOCKED)