[src/netbsd-7]: src/sys/dev/pci Pull up following revision(s) (requested by m...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9bb1311d0267
branches:  netbsd-7
changeset: 799501:9bb1311d0267
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Jul 30 09:23:05 2015 +0000

description:
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)

diffstat:

 sys/dev/pci/if_bge.c |  8 +++++---
 sys/dev/pci/if_pcn.c |  5 +++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diffs (56 lines):

diff -r 9fcde275e9e2 -r 9bb1311d0267 sys/dev/pci/if_bge.c
--- a/sys/dev/pci/if_bge.c      Fri Jul 24 07:32:50 2015 +0000
+++ b/sys/dev/pci/if_bge.c      Thu Jul 30 09:23:05 2015 +0000
@@ -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 @@
        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);
 
diff -r 9fcde275e9e2 -r 9bb1311d0267 sys/dev/pci/if_pcn.c
--- a/sys/dev/pci/if_pcn.c      Fri Jul 24 07:32:50 2015 +0000
+++ b/sys/dev/pci/if_pcn.c      Thu Jul 30 09:23:05 2015 +0000
@@ -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 @@
                                printf("%s: unable to load Tx buffer, "
                                    "error = %d\n", device_xname(sc->sc_dev),
                                    error);
+                               m_freem(m);
                                break;
                        }
                }