summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorae <ae@FreeBSD.org>2015-02-23 15:24:43 +0000
committerae <ae@FreeBSD.org>2015-02-23 15:24:43 +0000
commitc6a9e35096b0a72e984f99341ebf997a815d54b4 (patch)
tree50b9fbe47844706181fe908203a300d485944940
parent92ce4d2d912b47e5645d1d89408733995316ceca (diff)
downloadFreeBSD-src-c6a9e35096b0a72e984f99341ebf997a815d54b4.zip
FreeBSD-src-c6a9e35096b0a72e984f99341ebf997a815d54b4.tar.gz
soreceive_generic() still has similar KASSERT(), therefore instead of
remove KASSERT(), change it to check mbuf isn't NULL. Suggested by: kib MFC after: 1 week
-rw-r--r--sys/kern/uipc_socket.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 8bbf36a..a431b4b 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -2286,6 +2286,8 @@ soreceive_dgram(struct socket *so, struct sockaddr **psa, struct uio *uio,
cm = cmn;
}
}
+ KASSERT(m == NULL || m->m_type == MT_DATA,
+ ("soreceive_dgram: !data"));
while (m != NULL && uio->uio_resid > 0) {
len = uio->uio_resid;
if (len > m->m_len)
OpenPOWER on IntegriCloud