svn commit: r346035 - in stable: 11/sys/dev/iwm 12/sys/dev/iwm

[Kyle Evans]

Author: kevans
Date: Mon Apr  8 17:55:04 2019
New Revision: 346035
URL: https://svnweb.freebsd.org/changeset/base/346035

Log:
  MFC r343240: iwm(4): Fix possible null pointer indirection

Modified:
  stable/11/sys/dev/iwm/if_iwm.c
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/12/sys/dev/iwm/if_iwm.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/11/sys/dev/iwm/if_iwm.c
==============================================================================
--- stable/11/sys/dev/iwm/if_iwm.c	Mon Apr  8 17:41:39 2019	(r346034)
+++ stable/11/sys/dev/iwm/if_iwm.c	Mon Apr  8 17:55:04 2019	(r346035)
@@ -1032,7 +1032,8 @@ iwm_reset_rx_ring(struct iwm_softc *sc, struct iwm_rx_
 	 * The hw rx ring index in shared memory must also be cleared,
 	 * otherwise the discrepancy can cause reprocessing chaos.
 	 */
-	memset(sc->rxq.stat, 0, sizeof(*sc->rxq.stat));
+	if (sc->rxq.stat)
+		memset(sc->rxq.stat, 0, sizeof(*sc->rxq.stat));
 }
 
 static void