Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-7]: src/sys/dev/ic Pull up following revision(s) (requested by mr...
details: https://anonhg.NetBSD.org/src/rev/4ec235ed8ecd
branches: netbsd-7
changeset: 800292:4ec235ed8ecd
user: snj <snj%NetBSD.org@localhost>
date: Sat Aug 12 03:42:52 2017 +0000
description:
Pull up following revision(s) (requested by mrg in ticket #1472):
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 74b716485a32 -r 4ec235ed8ecd sys/dev/ic/dp83932.c
--- a/sys/dev/ic/dp83932.c Sat Aug 12 03:30:30 2017 +0000
+++ b/sys/dev/ic/dp83932.c Sat Aug 12 03:42:52 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dp83932.c,v 1.36 2013/10/25 21:29:28 martin Exp $ */
+/* $NetBSD: dp83932.c,v 1.36.4.1 2017/08/12 03:42:52 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.36 2013/10/25 21:29:28 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dp83932.c,v 1.36.4.1 2017/08/12 03:42:52 snj Exp $");
#include <sys/param.h>
@@ -785,8 +785,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