[src/netbsd-7]: src/sys/arch/mac68k/nubus Pull up following revision(s) (requ...

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

details:   https://anonhg.NetBSD.org/src/rev/db5d1ffcaf04
branches:  netbsd-7
changeset: 800287:db5d1ffcaf04
user:      snj <snj%NetBSD.org@localhost>
date:      Fri Aug 11 15:33:01 2017 +0000

description:
Pull up following revision(s) (requested by mrg in ticket #1468):
        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 c502a6357f67 -r db5d1ffcaf04 sys/arch/mac68k/nubus/if_netdock_nubus.c
--- a/sys/arch/mac68k/nubus/if_netdock_nubus.c  Fri Aug 11 15:21:38 2017 +0000
+++ b/sys/arch/mac68k/nubus/if_netdock_nubus.c  Fri Aug 11 15:33:01 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_netdock_nubus.c,v 1.22 2012/10/27 17:17:59 chs Exp $        */
+/*     $NetBSD: if_netdock_nubus.c,v 1.22.12.1 2017/08/11 15:33:01 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.22 2012/10/27 17:17:59 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_netdock_nubus.c,v 1.22.12.1 2017/08/11 15:33:01 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -804,6 +804,8 @@
                        if ((m->m_flags & M_EXT) == 0) {
                                if (top)
                                        m_freem(top);
+                               else
+                                       m_freem(m);
                                return (NULL);
                        }
                        len = MCLBYTES;