Source-Changes-HG archive

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

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



details:   https://anonhg.NetBSD.org/src/rev/3b6ed5b82bb4
branches:  netbsd-8
changeset: 434181:3b6ed5b82bb4
user:      snj <snj%NetBSD.org@localhost>
date:      Sat Aug 05 04:19:27 2017 +0000

description:
Pull up following revision(s) (requested by spz in ticket #181):
        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 616fc3ca300f -r 3b6ed5b82bb4 sys/arch/mac68k/nubus/if_netdock_nubus.c
--- a/sys/arch/mac68k/nubus/if_netdock_nubus.c  Sat Aug 05 04:17:03 2017 +0000
+++ b/sys/arch/mac68k/nubus/if_netdock_nubus.c  Sat Aug 05 04:19:27 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_netdock_nubus.c,v 1.25 2016/12/15 09:28:03 ozaki-r Exp $    */
+/*     $NetBSD: if_netdock_nubus.c,v 1.25.8.1 2017/08/05 04:19:27 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.25 2016/12/15 09:28:03 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_netdock_nubus.c,v 1.25.8.1 2017/08/05 04:19:27 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -802,6 +802,8 @@
                        if ((m->m_flags & M_EXT) == 0) {
                                if (top)
                                        m_freem(top);
+                               else
+                                       m_freem(m);
                                return (NULL);
                        }
                        len = MCLBYTES;



Home | Main Index | Thread Index | Old Index