Module Name: src
Committed By: snj
Date: Tue Aug 4 21:14:49 UTC 2015
Modified Files:
src/sys/dev/pci [netbsd-7]: if_ti.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #913):
sys/dev/pci/if_ti.c: revisions 1.94, 1.95
fix mbuf leak on failure (Brainy)
--
Memory leak. Same as r1.93. I don't know why Brainy didn't detect it
earlier; or perhaps I forgot to report it.
Found by Brainy.
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.93.4.1 src/sys/dev/pci/if_ti.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/dev/pci/if_ti.c
diff -u src/sys/dev/pci/if_ti.c:1.93 src/sys/dev/pci/if_ti.c:1.93.4.1
--- src/sys/dev/pci/if_ti.c:1.93 Sat Mar 29 19:28:25 2014
+++ src/sys/dev/pci/if_ti.c Tue Aug 4 21:14:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ti.c,v 1.93 2014/03/29 19:28:25 christos Exp $ */
+/* $NetBSD: if_ti.c,v 1.93.4.1 2015/08/04 21:14:49 snj Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ti.c,v 1.93 2014/03/29 19:28:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ti.c,v 1.93.4.1 2015/08/04 21:14:49 snj Exp $");
#include "opt_inet.h"
@@ -733,6 +733,7 @@ ti_newbuf_std(struct ti_softc *sc, int i
BUS_DMA_READ|BUS_DMA_NOWAIT)) != 0) {
aprint_error_dev(sc->sc_dev, "can't load recv map, error = %d\n",
error);
+ m_freem(m_new);
return (ENOMEM);
}
} else {
@@ -799,6 +800,7 @@ ti_newbuf_mini(struct ti_softc *sc, int
BUS_DMA_READ|BUS_DMA_NOWAIT)) != 0) {
aprint_error_dev(sc->sc_dev, "can't load recv map, error = %d\n",
error);
+ m_freem(m_new);
return (ENOMEM);
}
} else {
