Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 23 Feb 2015 15:24:43 +0000 (UTC)
From:      "Andrey V. Elsukov" <ae@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r279209 - head/sys/kern
Message-ID:  <201502231524.t1NFOhd2078683@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ae
Date: Mon Feb 23 15:24:43 2015
New Revision: 279209
URL: https://svnweb.freebsd.org/changeset/base/279209

Log:
  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

Modified:
  head/sys/kern/uipc_socket.c

Modified: head/sys/kern/uipc_socket.c
==============================================================================
--- head/sys/kern/uipc_socket.c	Mon Feb 23 15:05:39 2015	(r279208)
+++ head/sys/kern/uipc_socket.c	Mon Feb 23 15:24:43 2015	(r279209)
@@ -2286,6 +2286,8 @@ soreceive_dgram(struct socket *so, struc
 			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)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502231524.t1NFOhd2078683>