Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

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



details:   https://anonhg.NetBSD.org/src/rev/d892d14aff39
branches:  netbsd-8
changeset: 850909:d892d14aff39
user:      snj <snj%NetBSD.org@localhost>
date:      Sat Aug 05 04:45:30 2017 +0000

description:
Pull up following revision(s) (requested by spz in ticket #185):
        sys/dev/ic/dp83932.c: revision 1.41
Plug mbuf leak on MCLGET failure in sonic_rxintr.
>From Ilja Van Sprundel.

diffstat:

 sys/dev/ic/dp83932.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r 871ba007e614 -r d892d14aff39 sys/dev/ic/dp83932.c
--- a/sys/dev/ic/dp83932.c      Sat Aug 05 04:39:29 2017 +0000
+++ b/sys/dev/ic/dp83932.c      Sat Aug 05 04:45:30 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dp83932.c,v 1.40 2017/05/23 02:19:14 ozaki-r Exp $     */
+/*     $NetBSD: dp83932.c,v 1.40.2.1 2017/08/05 04:45:30 snj Exp $     */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dp83932.c,v 1.40 2017/05/23 02:19:14 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dp83932.c,v 1.40.2.1 2017/08/05 04:45:30 snj Exp $");
 
 
 #include <sys/param.h>
@@ -786,8 +786,10 @@
                                goto dropit;
                        if (len > (MHLEN - 2)) {
                                MCLGET(m, M_DONTWAIT);
-                               if ((m->m_flags & M_EXT) == 0)
+                               if ((m->m_flags & M_EXT) == 0) {
+                                       m_freem(m);
                                        goto dropit;
+                               }
                        }
                        m->m_data += 2;
                        /*



Home | Main Index | Thread Index | Old Index