Skip to contentSkip to conversation

compat: let git_mmap use malloc(3) directly

PATCH In review René Scharfe 3 participants 3 messages Aug 21, 2021 – Aug 23, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 compat: let git_mmap use malloc(3) directly

xmalloc() dies on error, allows zero-sized allocations and enforces GIT_ALLOC_LIMIT for testing. Our mmap replacement doesn't need any of that. Let's cut out the wrapper, reject zero-sized requests as required by POSIX and use malloc(3) directly. Allocation errors were needlessly handled by git_mmap() before; this code becomes reachable now.

---
 compat/mmap.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
compat/mmap.c +6 -1
index 14d31010df..8d6c02d4bc 100644
@@ -7,7 +7,12 @@ void *git_mmap(void *start, size_t length, int prot, int flags, int fd, off_t of
 	if (start != NULL || flags != MAP_PRIVATE || prot != PROT_READ)
 		die("Invalid usage of mmap when built with NO_MMAP");
 
-	start = xmalloc(length);
+	if (length == 0) {
+		errno = EINVAL;
+		return MAP_FAILED;
+	}
+
+	start = malloc(length);
 	if (start == NULL) {
 		errno = ENOMEM;
 		return MAP_FAILED;

--
2.33.0

#1 lore raw
Quoted 5 lines · René Scharfe

xmalloc() dies on error, allows zero-sized allocations and enforces GIT_ALLOC_LIMIT for testing. Our mmap replacement doesn't need any of that. Let's cut out the wrapper, reject zero-sized requests as required by POSIX and use malloc(3) directly. Allocation errors were needlessly handled by git_mmap() before; this code becomes reachable now.

Thanks, this is a good idea. As you note, the function was already expecting a possible NULL return. And I think in general it's good for our compat/ wrappers to stay as close to the OS-level functions they're emulating as possible.

-Peff

Acked-by on v1 1/1
#2 lore raw
In reply to René Scharfe

Hi René,

Quoted 5 lines · René Scharfe

xmalloc() dies on error, allows zero-sized allocations and enforces GIT_ALLOC_LIMIT for testing. Our mmap replacement doesn't need any of that. Let's cut out the wrapper, reject zero-sized requests as required by POSIX and use malloc(3) directly. Allocation errors were needlessly handled by git_mmap() before; this code becomes reachable now.

Thanks!
Dscho

Quoted 27 lines
---
 compat/mmap.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
compat/mmap.c +6 -2
index 14d31010df..8d6c02d4bc 100644
@@ -7,7 +7,12 @@ void *git_mmap(void *start, size_t length, int prot, int flags, int fd, off_t of
 	if (start != NULL || flags != MAP_PRIVATE || prot != PROT_READ)
 		die("Invalid usage of mmap when built with NO_MMAP");
 
-	start = xmalloc(length);
+	if (length == 0) {
+		errno = EINVAL;
+		return MAP_FAILED;
+	}
+
+	start = malloc(length);
 	if (start == NULL) {
 		errno = ENOMEM;
 		return MAP_FAILED;
--

2.33.0