Module Name: src
Committed By: snj
Date: Sat Aug 12 16:35:11 UTC 2017
Modified Files:
src/sys/arch/mac68k/nubus [netbsd-6]: if_netdock_nubus.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.21.14.1 src/sys/arch/mac68k/nubus/if_netdock_nubus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mac68k/nubus/if_netdock_nubus.c
diff -u src/sys/arch/mac68k/nubus/if_netdock_nubus.c:1.21 src/sys/arch/mac68k/nubus/if_netdock_nubus.c:1.21.14.1
--- src/sys/arch/mac68k/nubus/if_netdock_nubus.c:1.21 Mon Apr 5 07:19:30 2010
+++ src/sys/arch/mac68k/nubus/if_netdock_nubus.c Sat Aug 12 16:35:11 2017
@@ -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.14.1 2017/08/12 16:35:11 snj Exp $ */
/*
* Copyright (C) 2000,2002 Daishi Kato <dai...@axlight.com>
@@ -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.14.1 2017/08/12 16:35:11 snj Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -803,6 +803,8 @@ netdock_get(struct netdock_softc *sc, in
if ((m->m_flags & M_EXT) == 0) {
if (top)
m_freem(top);
+ else
+ m_freem(m);
return (NULL);
}
len = MCLBYTES;
