svn commit: r328017 - in head/sys: arm/xscale/ixp425 arm64/arm64

[Pedro F. Giffuni]

Author: pfg
Date: Mon Jan 15 21:09:58 2018
New Revision: 328017
URL: https://svnweb.freebsd.org/changeset/base/328017

Log:
  arm: make some use of mallocarray(9).
  
  Focus on code where we are doing multiplications within malloc(9). None of
  these ire likely to overflow, however the change is still useful as some
  static checkers can benefit from the allocation attributes we use for
  mallocarray.
  
  This initial sweep only covers malloc(9) calls with M_NOWAIT. No good
  reason but I started doing the changes before r327796 and at that time it
  was convenient to make sure the sorrounding code could handle NULL values.
  
  X-Differential revision: https://reviews.freebsd.org/D13837

Modified:
  head/sys/arm/xscale/ixp425/if_npe.c
  head/sys/arm64/arm64/busdma_bounce.c

Modified: head/sys/arm/xscale/ixp425/if_npe.c
==============================================================================
--- head/sys/arm/xscale/ixp425/if_npe.c	Mon Jan 15 21:08:22 2018	(r328016)
+++ head/sys/arm/xscale/ixp425/if_npe.c	Mon Jan 15 21:09:58 2018	(r328017)
@@ -515,7 +515,8 @@ npe_dma_setup(struct npe_softc *sc, struct npedma *dma
 		return error;
 	}
 	/* XXX M_TEMP */
-	dma->buf = malloc(nbuf * sizeof(struct npebuf), M_TEMP, M_NOWAIT | M_ZERO);
+	dma->buf = mallocarray(nbuf, sizeof(struct npebuf), M_TEMP,
+	    M_NOWAIT | M_ZERO);
 	if (dma->buf == NULL) {
 		device_printf(sc->sc_dev,
 		     "unable to allocate memory for %s s/w buffers\n",

Modified: head/sys/arm64/arm64/busdma_bounce.c
==============================================================================
--- head/sys/arm64/arm64/busdma_bounce.c	Mon Jan 15 21:08:22 2018	(r328016)
+++ head/sys/arm64/arm64/busdma_bounce.c	Mon Jan 15 21:09:58 2018	(r328017)
@@ -302,8 +302,8 @@ bounce_bus_dmamap_create(bus_dma_tag_t dmat, int flags
 	error = 0;
 
 	if (dmat->segments == NULL) {
-		dmat->segments = (bus_dma_segment_t *)malloc(
-		    sizeof(bus_dma_segment_t) * dmat->common.nsegments,
+		dmat->segments = (bus_dma_segment_t *)mallocarray(
+		    dmat->common.nsegments, sizeof(bus_dma_segment_t),
 		    M_DEVBUF, M_NOWAIT);
 		if (dmat->segments == NULL) {
 			CTR3(KTR_BUSDMA, "%s: tag %p error %d",