Module Name: src
Committed By: snj
Date: Sat Aug 12 03:45:15 UTC 2017
Modified Files:
src/sys/dev/ic [netbsd-7]: dm9000.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1473):
sys/dev/ic/dm9000.c: revision 1.12
Check for MCLGET failure in dme_alloc_receive_buffer.
>From Ilja Van Sprundel.
To generate a diff of this commit:
cvs rdiff -u -r1.4.22.1 -r1.4.22.2 src/sys/dev/ic/dm9000.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/dm9000.c
diff -u src/sys/dev/ic/dm9000.c:1.4.22.1 src/sys/dev/ic/dm9000.c:1.4.22.2
--- src/sys/dev/ic/dm9000.c:1.4.22.1 Fri Jan 2 20:24:14 2015
+++ src/sys/dev/ic/dm9000.c Sat Aug 12 03:45:15 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: dm9000.c,v 1.4.22.1 2015/01/02 20:24:14 martin Exp $ */
+/* $NetBSD: dm9000.c,v 1.4.22.2 2017/08/12 03:45:15 snj Exp $ */
/*
* Copyright (c) 2009 Paul Fleischer
@@ -1122,8 +1122,13 @@ dme_alloc_receive_buffer(struct ifnet *i
sizeof(struct ether_header);
/* All our frames have the CRC attached */
m->m_flags |= M_HASFCS;
- if (m->m_pkthdr.len + pad > MHLEN )
+ if (m->m_pkthdr.len + pad > MHLEN) {
MCLGET(m, M_DONTWAIT);
+ if ((m->m_flags & M_EXT) == 0) {
+ m_freem(m);
+ return NULL;
+ }
+ }
m->m_data += pad;
m->m_len = frame_length + (frame_length % sc->sc_data_width);
