apio/Luna
1
1
Fork 0
Code Issues Pull Requests Actions Projects Releases 8 Wiki Activity

Heap: Use safe_mul in kcalloc()

Browse Source
This commit is contained in:
apio 2022-12-06 15:44:21 +01:00
parent e91c04b1d1
commit b338126854
Signed by: apio
GPG Key ID: B8A7D06E42258954
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/src/memory/Heap.cpp
View File

@ -5,6 +5,7 @@
#include "memory/KernelVM.h" #include "memory/KernelVM.h"
#include "memory/MemoryManager.h" #include "memory/MemoryManager.h"
#include <luna/Alignment.h> #include <luna/Alignment.h>
#include <luna/SafeArithmetic.h>
#include <luna/String.h> #include <luna/String.h>
#include <luna/SystemError.h> #include <luna/SystemError.h>
@ -332,8 +333,7 @@ Result<void*> krealloc(void* ptr, usize size)
Result<void*> kcalloc(usize nmemb, usize size) Result<void*> kcalloc(usize nmemb, usize size)
{ {
// FIXME: Check for overflows. const usize realsize = TRY(safe_mul(nmemb, size));
const usize realsize = nmemb * size;
void* const ptr = TRY(kmalloc(realsize)); void* const ptr = TRY(kmalloc(realsize));
return memset(ptr, 0, realsize); return memset(ptr, 0, realsize);
} }