Author: pfg
Date: Thu Jan 11 15:44:03 2018
New Revision: 327831
URL: https://svnweb.freebsd.org/changeset/base/327831
Log:
dev/bhnd: Make use of mallocarray(9).
This makes a calloc-like definition check for overflows as is common
practice.
Modified:
head/sys/dev/bhnd/bcma/bcma_erom.c
head/sys/dev/bhnd/nvram/bhnd_nvram_private.h
head/sys/dev/bhnd/siba/siba_erom.c
Modified: head/sys/dev/bhnd/bcma/bcma_erom.c
==============================================================================
--- head/sys/dev/bhnd/bcma/bcma_erom.c Thu Jan 11 15:32:12 2018
(r327830)
+++ head/sys/dev/bhnd/bcma/bcma_erom.c Thu Jan 11 15:44:03 2018
(r327831)
@@ -400,7 +400,7 @@ bcma_erom_get_core_table(bhnd_erom_t *erom, struct bhn
}
/* 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;
Modified: head/sys/dev/bhnd/nvram/bhnd_nvram_private.h
==============================================================================
--- head/sys/dev/bhnd/nvram/bhnd_nvram_private.h Thu Jan 11 15:32:12
2018 (r327830)
+++ head/sys/dev/bhnd/nvram/bhnd_nvram_private.h Thu Jan 11 15:44:03
2018 (r327831)
@@ -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)
Modified: head/sys/dev/bhnd/siba/siba_erom.c
==============================================================================
--- head/sys/dev/bhnd/siba/siba_erom.c Thu Jan 11 15:32:12 2018
(r327830)
+++ head/sys/dev/bhnd/siba/siba_erom.c Thu Jan 11 15:44:03 2018
(r327831)
@@ -445,7 +445,7 @@ siba_erom_get_core_table(bhnd_erom_t *erom, struct bhn
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);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
