svn commit: r328024 - head/sys/netgraph

[Pedro F. Giffuni]

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

Log:
  netgraph: 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/netgraph/ng_bridge.c
  head/sys/netgraph/ng_deflate.c
  head/sys/netgraph/ng_parse.c

Modified: head/sys/netgraph/ng_bridge.c
==============================================================================
--- head/sys/netgraph/ng_bridge.c	Mon Jan 15 21:18:04 2018	(r328023)
+++ head/sys/netgraph/ng_bridge.c	Mon Jan 15 21:19:21 2018	(r328024)
@@ -907,7 +907,7 @@ ng_bridge_rehash(priv_p priv)
 	newMask = newNumBuckets - 1;
 
 	/* Allocate and initialize new table */
-	newTab = malloc(newNumBuckets * sizeof(*newTab),
+	newTab = mallocarray(newNumBuckets, sizeof(*newTab),
 	    M_NETGRAPH_BRIDGE, M_NOWAIT | M_ZERO);
 	if (newTab == NULL)
 		return;

Modified: head/sys/netgraph/ng_deflate.c
==============================================================================
--- head/sys/netgraph/ng_deflate.c	Mon Jan 15 21:18:04 2018	(r328023)
+++ head/sys/netgraph/ng_deflate.c	Mon Jan 15 21:19:21 2018	(r328024)
@@ -427,7 +427,7 @@ static void *
 z_alloc(void *notused, u_int items, u_int size)
 {
 
-	return (malloc(items * size, M_NETGRAPH_DEFLATE, M_NOWAIT));
+	return (mallocarray(items, size, M_NETGRAPH_DEFLATE, M_NOWAIT));
 }
 
 static void

Modified: head/sys/netgraph/ng_parse.c
==============================================================================
--- head/sys/netgraph/ng_parse.c	Mon Jan 15 21:18:04 2018	(r328023)
+++ head/sys/netgraph/ng_parse.c	Mon Jan 15 21:19:21 2018	(r328024)
@@ -1207,7 +1207,8 @@ ng_parse_composite(const struct ng_parse_type *type, c
 	int align, len, blen, error = 0;
 
 	/* Initialize */
-	foff = malloc(num * sizeof(*foff), M_NETGRAPH_PARSE, M_NOWAIT | M_ZERO);
+	foff = mallocarray(num, sizeof(*foff), M_NETGRAPH_PARSE,
+	    M_NOWAIT | M_ZERO);
 	if (foff == NULL) {
 		error = ENOMEM;
 		goto done;