[src/netbsd-6-1]: src/sys/arch/mac68k/nubus Pull up following revision(s) (re...

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

details:   https://anonhg.NetBSD.org/src/rev/3affa3b3b78f
branches:  netbsd-6-1
changeset: 776224:3affa3b3b78f
user:      snj <snj%NetBSD.org@localhost>
date:      Sat Aug 12 16:36:20 2017 +0000

description:
Pull up following revision(s) (requested by mrg in ticket #1472):
        sys/arch/mac68k/nubus/if_netdock_nubus.c: revision 1.26
Avoid memory leak in netdock_get.
If top is null, this is the first time through and nothing else will
free m.
>From Ilja Van Sprundel.

diffstat:

 sys/arch/mac68k/nubus/if_netdock_nubus.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 7aeb76e340ec -r 3affa3b3b78f sys/arch/mac68k/nubus/if_netdock_nubus.c
--- a/sys/arch/mac68k/nubus/if_netdock_nubus.c  Sat Aug 12 16:29:24 2017 +0000
+++ b/sys/arch/mac68k/nubus/if_netdock_nubus.c  Sat Aug 12 16:36:20 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_netdock_nubus.c,v 1.21 2010/04/05 07:19:30 joerg Exp $      */
+/*     $NetBSD: if_netdock_nubus.c,v 1.21.22.1 2017/08/12 16:36:20 snj Exp $   */
 
 /*
  * Copyright (C) 2000,2002 Daishi Kato <daishi%axlight.com@localhost>
@@ -43,7 +43,7 @@
 /***********************/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_netdock_nubus.c,v 1.21 2010/04/05 07:19:30 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_netdock_nubus.c,v 1.21.22.1 2017/08/12 16:36:20 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -803,6 +803,8 @@
                        if ((m->m_flags & M_EXT) == 0) {
                                if (top)
                                        m_freem(top);
+                               else
+                                       m_freem(m);
                                return (NULL);
                        }
                        len = MCLBYTES;