[src/trunk]: src/sys/dev/pci more precise m_freem() on error paths, and updat...

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

details:   https://anonhg.NetBSD.org/src/rev/c48954470b45
branches:  trunk
changeset: 823988:c48954470b45
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Wed May 17 20:13:02 2017 +0000

description:
more precise m_freem() on error paths, and update m after the m_defrag() call

diffstat:

 sys/dev/pci/if_vioif.c |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (49 lines):

diff -r 617d243bf6d0 -r c48954470b45 sys/dev/pci/if_vioif.c
--- a/sys/dev/pci/if_vioif.c    Wed May 17 20:04:50 2017 +0000
+++ b/sys/dev/pci/if_vioif.c    Wed May 17 20:13:02 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_vioif.c,v 1.36 2017/05/17 20:04:50 jdolecek Exp $   */
+/*     $NetBSD: if_vioif.c,v 1.37 2017/05/17 20:13:02 jdolecek Exp $   */
 
 /*
  * Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.36 2017/05/17 20:04:50 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.37 2017/05/17 20:13:02 jdolecek Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -832,19 +832,19 @@
                        if (newm == NULL) {
                                aprint_error_dev(sc->sc_dev,
                                    "m_defrag() failed\n");
-                               m_freem(m);
                                goto skip;
                        }
 
+                       m = newm;
                        r = bus_dmamap_load_mbuf(virtio_dmat(vsc),
                                         sc->sc_tx_dmamaps[slot],
-                                        newm, BUS_DMA_WRITE|BUS_DMA_NOWAIT);
+                                        m, BUS_DMA_WRITE|BUS_DMA_NOWAIT);
                        if (r != 0) {
                                aprint_error_dev(sc->sc_dev,
                                    "tx dmamap load failed, error code %d\n",
                                    r);
-                               m_freem(newm);
 skip:
+                               m_freem(m);
                                virtio_enqueue_abort(vsc, vq, slot);
                                continue;
                        }
@@ -860,6 +860,7 @@
                        bus_dmamap_unload(virtio_dmat(vsc),
                                          sc->sc_tx_dmamaps[slot]);
                        /* slot already freed by virtio_enqueue_reserve */
+                       m_freem(m);
                        continue;
                }