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

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

details:   https://anonhg.NetBSD.org/src/rev/588859687feb
branches:  netbsd-6
changeset: 774422:588859687feb
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Aug 12 18:58:28 2012 +0000

description:
Pull up following revision(s) (requested by riastradh in ticket #480):
        sys/dev/pci/if_msk.c: revision 1.42
Fix null pointer dereference in msk_rxeof.
This triggers when processing an RX interrupt that was queued while
stopping the interface, which caused my machine to panic last night.
In this case, just drop the packet.
>From OpenBSD's if_msk.c rev. 1.71.

diffstat:

 sys/dev/pci/if_msk.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r 4e4a2bd12588 -r 588859687feb sys/dev/pci/if_msk.c
--- a/sys/dev/pci/if_msk.c      Sun Aug 12 18:56:54 2012 +0000
+++ b/sys/dev/pci/if_msk.c      Sun Aug 12 18:58:28 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_msk.c,v 1.39 2012/02/02 19:43:05 tls Exp $ */
+/* $NetBSD: if_msk.c,v 1.39.2.1 2012/08/12 18:58:28 martin Exp $ */
 /*     $OpenBSD: if_msk.c,v 1.42 2007/01/17 02:43:02 krw Exp $ */
 
 /*
@@ -52,7 +52,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.39 2012/02/02 19:43:05 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.39.2.1 2012/08/12 18:58:28 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1703,8 +1703,10 @@
        MSK_CDRXSYNC(sc_if, cur, BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE);
 
        cur_rx = &sc_if->sk_cdata.sk_rx_chain[cur];
+       if (cur_rx->sk_mbuf == NULL)
+               return;
+
        dmamap = sc_if->sk_cdata.sk_rx_jumbo_map;
-
        bus_dmamap_sync(sc_if->sk_softc->sc_dmatag, dmamap, 0,
            dmamap->dm_mapsize, BUS_DMASYNC_POSTREAD);