From 5426a059d611c1fd4b7e08b6a1bfc496480148a1 Mon Sep 17 00:00:00 2001
From: pfg <pfg@FreeBSD.org>
Date: Mon, 15 Jan 2018 21:13:30 +0000
Subject: [PATCH] mips: 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
---
 sys/mips/mips/busdma_machdep.c | 13 ++++++-------
 sys/mips/nlm/dev/sec/nlmrsa.c  |  7 ++++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sys/mips/mips/busdma_machdep.c b/sys/mips/mips/busdma_machdep.c
index e2f9e226c27d..10d0e9c440bb 100644
--- a/sys/mips/mips/busdma_machdep.c
+++ b/sys/mips/mips/busdma_machdep.c
@@ -345,7 +345,8 @@ _busdma_alloc_dmamap(bus_dma_tag_t dmat)
 	struct sync_list *slist;
 	bus_dmamap_t map;
 
-	slist = malloc(sizeof(*slist) * dmat->nsegments, M_BUSDMA, M_NOWAIT);
+	slist = mallocarray(dmat->nsegments, sizeof(*slist), M_BUSDMA,
+	    M_NOWAIT);
 	if (slist == NULL)
 		return (NULL);
 	map = uma_zalloc_arg(dmamap_zone, dmat, M_NOWAIT);
@@ -534,9 +535,8 @@ bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp)
 	int error = 0;
 
 	if (dmat->segments == NULL) {
-		dmat->segments = (bus_dma_segment_t *)malloc(
-		    sizeof(bus_dma_segment_t) * dmat->nsegments, M_BUSDMA,
-		    M_NOWAIT);
+		dmat->segments = (bus_dma_segment_t *)malloc(dmat->nsegments,
+		    sizeof(bus_dma_segment_t), M_BUSDMA, M_NOWAIT);
 		if (dmat->segments == NULL) {
 			CTR3(KTR_BUSDMA, "%s: tag %p error %d",
 			    __func__, dmat, ENOMEM);
@@ -647,9 +647,8 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddrp, int flags,
 	else
 		mflags = M_WAITOK;
 	if (dmat->segments == NULL) {
-		dmat->segments = (bus_dma_segment_t *)malloc(
-		    sizeof(bus_dma_segment_t) * dmat->nsegments, M_BUSDMA,
-		    mflags);
+		dmat->segments = (bus_dma_segment_t *)malloc(dmat->nsegments,
+		    sizeof(bus_dma_segment_t), M_BUSDMA, mflags);
 		if (dmat->segments == NULL) {
 			CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
 			    __func__, dmat, dmat->flags, ENOMEM);
diff --git a/sys/mips/nlm/dev/sec/nlmrsa.c b/sys/mips/nlm/dev/sec/nlmrsa.c
index 2c672675c48d..8ee0e64b7004 100644
--- a/sys/mips/nlm/dev/sec/nlmrsa.c
+++ b/sys/mips/nlm/dev/sec/nlmrsa.c
@@ -346,7 +346,7 @@ xlp_rsa_newsession(device_t dev, u_int32_t *sidp, struct cryptoini *cri)
 
 		if (ses == NULL) {
 			sesn = sc->sc_nsessions;
-			ses = malloc((sesn + 1) * sizeof(*ses),
+			ses = mallocarray(sesn + 1, sizeof(*ses),
 			    M_DEVBUF, M_NOWAIT);
 			if (ses == NULL)
 				return (ENOMEM);
@@ -528,8 +528,9 @@ xlp_rsa_kprocess(device_t dev, struct cryptkop *krp, int hint)
 		goto errout;
 	}
 	cmd->rsafn = 0; /* Mod Exp */
-	cmd->rsasrc = malloc(
-	    cmd->rsaopsize * (krp->krp_iparams + krp->krp_oparams),
+	cmd->rsasrc = mallocarray(
+	    krp->krp_iparams + krp->krp_oparams,
+	    cmd->rsaopsize,
 	    M_DEVBUF,
 	    M_NOWAIT | M_ZERO);
 	if (cmd->rsasrc == NULL) {