CVS commit: [netbsd-7] src/sys/dev/pci

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Thu Jul 30 09:23:05 UTC 2015

Modified Files:
        src/sys/dev/pci [netbsd-7]: if_bge.c if_pcn.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #889):
        sys/dev/pci/if_bge.c: revision 1.283
        sys/dev/pci/if_pcn.c: revision 1.60
Fix mbuf leaks in error branches (found by the Brainy code scanner)


To generate a diff of this commit:
cvs rdiff -u -r1.277.2.2 -r1.277.2.3 src/sys/dev/pci/if_bge.c
cvs rdiff -u -r1.58 -r1.58.2.1 src/sys/dev/pci/if_pcn.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_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.277.2.2 src/sys/dev/pci/if_bge.c:1.277.2.3
--- src/sys/dev/pci/if_bge.c:1.277.2.2	Sat May  9 08:37:53 2015
+++ src/sys/dev/pci/if_bge.c	Thu Jul 30 09:23:05 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_bge.c,v 1.277.2.2 2015/05/09 08:37:53 snj Exp $	*/
+/*	$NetBSD: if_bge.c,v 1.277.2.3 2015/07/30 09:23:05 martin Exp $	*/
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.277.2.2 2015/05/09 08:37:53 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.277.2.3 2015/07/30 09:23:05 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1744,8 +1744,10 @@ bge_newbuf_std(struct bge_softc *sc, int
 	if (!(sc->bge_flags & BGEF_RX_ALIGNBUG))
 	    m_adj(m_new, ETHER_ALIGN);
 	if (bus_dmamap_load_mbuf(sc->bge_dmatag, dmamap, m_new,
-	    BUS_DMA_READ|BUS_DMA_NOWAIT))
+	    BUS_DMA_READ|BUS_DMA_NOWAIT)) {
+		m_freem(m_new);
 		return ENOBUFS;
+	}
 	bus_dmamap_sync(sc->bge_dmatag, dmamap, 0, dmamap->dm_mapsize,
 	    BUS_DMASYNC_PREREAD);
 

Index: src/sys/dev/pci/if_pcn.c
diff -u src/sys/dev/pci/if_pcn.c:1.58 src/sys/dev/pci/if_pcn.c:1.58.2.1
--- src/sys/dev/pci/if_pcn.c:1.58	Sun Aug 10 16:44:36 2014
+++ src/sys/dev/pci/if_pcn.c	Thu Jul 30 09:23:05 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_pcn.c,v 1.58 2014/08/10 16:44:36 tls Exp $	*/
+/*	$NetBSD: if_pcn.c,v 1.58.2.1 2015/07/30 09:23:05 martin Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.58 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.58.2.1 2015/07/30 09:23:05 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -982,6 +982,7 @@ pcn_start(struct ifnet *ifp)
 				printf("%s: unable to load Tx buffer, "
 				    "error = %d\n", device_xname(sc->sc_dev),
 				    error);
+				m_freem(m);
 				break;
 			}
 		}