From: Rich Felker <dalias@aerifal.cx>
Date: Mon, 12 Feb 2018 01:48:14 +0000 (-0500)
Subject: fix incorrect overflow check for allocation in fmemopen
X-Git-Tag: v1.1.19~5
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=75cba9c67fde03421b96c1bcbaf666b4b348739d;p=oweals%2Fmusl.git

fix incorrect overflow check for allocation in fmemopen

when a null buffer pointer is passed to fmemopen, requesting it
allocate its own memory buffer, extremely large size arguments near
SIZE_MAX could overflow and result in underallocation. this results
from omission of the size of the cookie structure in the overflow
check but inclusion of it in the calloc call.

instead of accounting for individual small contributions to the total
allocation size needed, simply reject sizes larger than PTRDIFF_MAX,
which will necessarily fail anyway. then adding arbitrary fixed-size
structures is safe without matching up the expressions in the
comparison and the allocation.
---

diff --git a/src/stdio/fmemopen.c b/src/stdio/fmemopen.c
index 7c193a57..2ce43d32 100644
--- a/src/stdio/fmemopen.c
+++ b/src/stdio/fmemopen.c
@@ -81,7 +81,7 @@ FILE *fmemopen(void *restrict buf, size_t size, const char *restrict mode)
 		return 0;
 	}
 
-	if (!buf && size > SIZE_MAX-sizeof(FILE)-BUFSIZ-UNGET) {
+	if (!buf && size > PTRDIFF_MAX) {
 		errno = ENOMEM;
 		return 0;
 	}