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

drm2: Basic use of mallocarray(9).

Browse Source 
These functions deal the same type of overflows we do with mallocarray(9).
Using our mallocarray will panic, which different from the previous
behavior (returning NULL), but neither behavior is more correct.

As a sidenote, drm_calloc_large() is not currently used at all.

Reviewed by:	dumbbell
Differential Revision:	https://reviews.freebsd.org/D13835
This commit is contained in:
pfg 2018-01-22 15:55:51 +00:00
parent 0833ef388c
commit 1deb03ba9c
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/drm2/drm_mem_util.h
View File

@ -36,19 +36,15 @@ __FBSDID("$FreeBSD$");
static __inline__ void *drm_calloc_large(size_t nmemb, size_t size)
{
if (size != 0 && nmemb > SIZE_MAX / size)
return NULL;
return malloc(nmemb * size, DRM_MEM_DRIVER, M_NOWAIT | M_ZERO);
return mallocarray(nmemb, size, DRM_MEM_DRIVER, M_NOWAIT | M_ZERO);
}
/* Modeled after cairo's malloc_ab, it's like calloc but without the zeroing. */
static __inline__ void *drm_malloc_ab(size_t nmemb, size_t size)
{
if (size != 0 && nmemb > SIZE_MAX / size)
return NULL;
return malloc(nmemb * size, DRM_MEM_DRIVER, M_NOWAIT);
return mallocarray(nmemb, size, DRM_MEM_DRIVER, M_NOWAIT);
}
static __inline void drm_free_large(void *ptr)