Module Name: src Committed By: martin Date: Sun Aug 12 18:58:29 UTC 2012
Modified Files: src/sys/dev/pci [netbsd-6]: if_msk.c Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.39.2.1 src/sys/dev/pci/if_msk.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_msk.c diff -u src/sys/dev/pci/if_msk.c:1.39 src/sys/dev/pci/if_msk.c:1.39.2.1 --- src/sys/dev/pci/if_msk.c:1.39 Thu Feb 2 19:43:05 2012 +++ src/sys/dev/pci/if_msk.c Sun Aug 12 18:58:28 2012 @@ -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_rxeof(struct sk_if_softc *sc_if, u_i MSK_CDRXSYNC(sc_if, cur, BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); cur_rx = &sc_if->sk_cdata.sk_rx_chain[cur]; - dmamap = sc_if->sk_cdata.sk_rx_jumbo_map; + 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);