svn commit: r245878 - head/sys/net

[Gleb Smirnoff]

Author: glebius
Date: Thu Jan 24 14:29:31 2013
New Revision: 245878
URL: http://svnweb.freebsd.org/changeset/base/245878

Log:
  - Utilize m_get2(), accidentially fixing some signedness bugs.
  - Return EMSGSIZE in both cases if uio_resid is oversized or undersized.
  - No need to clear rcvif.

Modified:
  head/sys/net/bpf.c

Modified: head/sys/net/bpf.c
==============================================================================
--- head/sys/net/bpf.c	Thu Jan 24 11:42:16 2013	(r245877)
+++ head/sys/net/bpf.c	Thu Jan 24 14:29:31 2013	(r245878)
@@ -522,32 +522,15 @@ bpf_movein(struct uio *uio, int linktype
 	}
 
 	len = uio->uio_resid;
-
-	if (len - hlen > ifp->if_mtu)
+	if (len < hlen || len - hlen > ifp->if_mtu)
 		return (EMSGSIZE);
 
-	if ((unsigned)len > MJUM16BYTES)
+	m = m_get2(M_WAITOK, MT_DATA, M_PKTHDR, len);
+	if (m == NULL)
 		return (EIO);
-
-	if (len <= MHLEN)
-		MGETHDR(m, M_WAITOK, MT_DATA);
-	else if (len <= MCLBYTES)
-		m = m_getcl(M_WAITOK, MT_DATA, M_PKTHDR);
-	else
-		m = m_getjcl(M_WAITOK, MT_DATA, M_PKTHDR,
-#if (MJUMPAGESIZE > MCLBYTES)
-		    len <= MJUMPAGESIZE ? MJUMPAGESIZE :
-#endif
-		    (len <= MJUM9BYTES ? MJUM9BYTES : MJUM16BYTES));
 	m->m_pkthdr.len = m->m_len = len;
-	m->m_pkthdr.rcvif = NULL;
 	*mp = m;
 
-	if (m->m_len < hlen) {
-		error = EPERM;
-		goto bad;
-	}
-
 	error = uiomove(mtod(m, u_char *), len, uio);
 	if (error)
 		goto bad;