[src/netbsd-6]: src/sys/dev/ic Pull up following revision(s) (requested by mr...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/85d995d9f147
branches:  netbsd-6
changeset: 777215:85d995d9f147
user:      snj <snj%NetBSD.org@localhost>
date:      Fri Aug 18 15:08:21 2017 +0000

description:
Pull up following revision(s) (requested by mrg in ticket #1477):
        sys/dev/ic/dm9000.c: revision 1.12
Check for MCLGET failure in dme_alloc_receive_buffer.
>From Ilja Van Sprundel.

diffstat:

 sys/dev/ic/dm9000.c |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r 4f210da2a286 -r 85d995d9f147 sys/dev/ic/dm9000.c
--- a/sys/dev/ic/dm9000.c       Fri Aug 18 15:04:58 2017 +0000
+++ b/sys/dev/ic/dm9000.c       Fri Aug 18 15:08:21 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dm9000.c,v 1.4 2012/01/28 08:29:55 nisimura Exp $      */
+/*     $NetBSD: dm9000.c,v 1.4.2.1 2017/08/18 15:08:21 snj Exp $       */
 
 /*
  * Copyright (c) 2009 Paul Fleischer
@@ -1123,8 +1123,13 @@
                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);