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
This commit is contained in:
parent
a18a2290cd
commit
3b0a4e40a0
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=328024
@ -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;
|
||||
|
@ -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
|
||||
|
@ -1207,7 +1207,8 @@ ng_parse_composite(const struct ng_parse_type *type, const char *s,
|
||||
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;
|
||||
|
Loading…
Reference in New Issue
Block a user