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

netpfil/ipfw: Make some use of mallocarray(9).

Browse Source 
Reviewed by:	kp, ae
Differential Revision: https://reviews.freebsd.org/D13834
This commit is contained in:
Pedro F. Giffuni 2018-01-11 15:29:29 +00:00
parent efaa3e0789
commit 454529cd0b
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/netpfil/ipfw/dn_heap.c
View File

@ -94,7 +94,7 @@ heap_resize(struct dn_heap *h, unsigned int new_size)
#else
new_size = (new_size + HEAP_INCREMENT ) & ~HEAP_INCREMENT;
#endif
p = malloc(new_size * sizeof(*p), M_DN_HEAP, M_NOWAIT);
p = mallocarray(new_size, sizeof(*p), M_DN_HEAP, M_NOWAIT);
if (p == NULL) {
printf("--- %s, resize %d failed\n", __func__, new_size );
return 1; /* error */

4
sys/netpfil/ipfw/dn_sched_fq_codel.c
View File

@ -453,8 +453,8 @@ fq_codel_new_sched(struct dn_sch_inst *_si)
q->fs = _si->sched->fs;
/* allocate memory for flows array */
si->flows = malloc(schk->cfg.flows_cnt * sizeof(struct fq_codel_flow),
M_DUMMYNET, M_NOWAIT | M_ZERO);
si->flows = mallocarray(schk->cfg.flows_cnt,
sizeof(struct fq_codel_flow), M_DUMMYNET, M_NOWAIT | M_ZERO);
if (si->flows == NULL) {
D("cannot allocate memory for fq_codel configuration parameters");
return ENOMEM ;

4
sys/netpfil/ipfw/dn_sched_fq_pie.c
View File

@ -1034,8 +1034,8 @@ fq_pie_new_sched(struct dn_sch_inst *_si)
return ENOMEM ;
}
/* allocate memory for flows array */
si->si_extra->flows = malloc(schk->cfg.flows_cnt * sizeof(struct fq_pie_flow),
M_DUMMYNET, M_NOWAIT | M_ZERO);
si->si_extra->flows = mallocarray(schk->cfg.flows_cnt,
sizeof(struct fq_pie_flow), M_DUMMYNET, M_NOWAIT | M_ZERO);
flows = si->si_extra->flows;
if (flows == NULL) {
free(si->si_extra, M_DUMMYNET);