d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dev/bhnd: Make use of mallocarray(9).

Browse Source 
This makes a calloc-like definition check for overflows as is common
practice.
This commit is contained in:
Pedro F. Giffuni 2018-01-11 15:44:03 +00:00
parent 454529cd0b
commit 92e1020a52
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/bhnd/bcma/bcma_erom.c
View File

@ -400,7 +400,7 @@ bcma_erom_get_core_table(bhnd_erom_t *erom, struct bhnd_core_info **cores,
}
/* Allocate our output buffer */
buffer = malloc(sizeof(struct bhnd_core_info) * count, M_BHND,
buffer = mallocarray(count, sizeof(struct bhnd_core_info), M_BHND,
M_NOWAIT);
if (buffer == NULL) {
error = ENOMEM;

2
sys/dev/bhnd/nvram/bhnd_nvram_private.h
View File

@ -74,7 +74,7 @@ MALLOC_DECLARE(M_BHND_NVRAM);
#define bhnd_nv_toupper(c) toupper(c)
#define bhnd_nv_malloc(size) malloc((size), M_BHND_NVRAM, M_NOWAIT)
#define bhnd_nv_calloc(n, size) malloc((n) * (size), M_BHND_NVRAM, \
#define bhnd_nv_calloc(n, size) mallocarray((n), (size), M_BHND_NVRAM, \
M_NOWAIT | M_ZERO)
#define bhnd_nv_reallocf(buf, size) reallocf((buf), (size), M_BHND_NVRAM, \
M_NOWAIT)

2
sys/dev/bhnd/siba/siba_erom.c
View File

@ -445,7 +445,7 @@ siba_erom_get_core_table(bhnd_erom_t *erom, struct bhnd_core_info **cores,
sc = (struct siba_erom *)erom;
/* Allocate our core array */
out = malloc(sizeof(*out) * sc->io.ncores, M_BHND, M_NOWAIT);
out = mallocarray(sc->io.ncores, sizeof(*out), M_BHND, M_NOWAIT);
if (out == NULL)
return (ENOMEM);