CVS commit: src/sys/netipsec

["Ryota Ozaki" <ozaki-r%netbsd.org@localhost>]

Module Name:    src
Committed By:   ozaki-r
Date:           Tue Aug  8 10:41:33 UTC 2017

Modified Files:
        src/sys/netipsec: keysock.c

Log Message:
Fix KASSERT(solocked(sb->sb_so)) failure in sbappendaddr that is called eventually from key_sendup_mbuf

If key_sendup_mbuf isn't passed a socket, the assertion fails.
Originally in this case sb->sb_so was softnet_lock and callers
held softnet_lock so the assertion was magically satisfied.
Now sb->sb_so is key_so_mtx and also softnet_lock isn't always
held by callers so the assertion can fail.

Fix it by holding key_so_mtx if key_sendup_mbuf isn't passed a socket.

Reported by knakahara@
Tested by knakahara@ and ozaki-r@


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/netipsec/keysock.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.