jmb/hardened_malloc
1
0
Fork 0
mirror of https://github.com/GrapheneOS/hardened_malloc.git synced 2025-04-19 22:10:19 +02:00
Code Issues Projects Releases Packages Wiki Activity

Gracefully handle pkey unavailable

Browse source 
All other pkey syscalls already handle errors gracefully.
But in case of a seccomp filter that blocks pkey but doesn't terminate, this change is necessary to continue to function.

Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2023-11-25 17:30:26 -05:00
parent 61821b02c8
commit 3ecd4ce354
No known key found for this signature in database
GPG key ID: B286E9F57A07424B
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
memory.c
View file

@ -61,7 +61,12 @@ bool memory_unmap(void *ptr, size_t size) {
static bool memory_protect_prot(void *ptr, size_t size, int prot, UNUSED int pkey) {
#ifdef USE_PKEY
bool ret = pkey_mprotect(ptr, size, prot, pkey);
bool ret;
if (pkey > 0) {
ret = pkey_mprotect(ptr, size, prot, pkey);
} else {
ret = mprotect(ptr, size, prot);
}
#else
bool ret = mprotect(ptr, size, prot);
#endif