Commit 1ef150cf authored by Ammar Faizi's avatar Ammar Faizi Committed by Paul E. McKenney

tools/nolibc/stdlib: Support overflow checking for older compiler versions

Previously, we used __builtin_mul_overflow() to check for overflow in
the multiplication operation in the calloc() function. However, older
compiler versions don't support this built-in. This patch changes the
overflow checking mechanism to make it work on any compiler version
by using a division method to check for overflow. No functional change
intended. While in there, remove the unused variable `void *orig`.

Link: https://lore.kernel.org/lkml/20220330024114.GA18892@1wt.euSuggested-by: default avatarWilly Tarreau <w@1wt.eu>
Cc: Alviro Iskandar Setiawan <alviro.iskandar@gnuweeb.org>
Signed-off-by: default avatarAmmar Faizi <ammarfaizi2@gnuweeb.org>
Acked-by: default avatarWilly Tarreau <w@1wt.eu>
Reviewed-by: default avatarAlviro Iskandar Setiawan <alviro.iskandar@gnuweeb.org>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent a111daf0
...@@ -128,10 +128,9 @@ void *malloc(size_t len) ...@@ -128,10 +128,9 @@ void *malloc(size_t len)
static __attribute__((unused)) static __attribute__((unused))
void *calloc(size_t size, size_t nmemb) void *calloc(size_t size, size_t nmemb)
{ {
void *orig; size_t x = size * nmemb;
size_t res = 0;
if (__builtin_expect(__builtin_mul_overflow(nmemb, size, &res), 0)) { if (__builtin_expect(size && ((x / size) != nmemb), 0)) {
SET_ERRNO(ENOMEM); SET_ERRNO(ENOMEM);
return NULL; return NULL;
} }
...@@ -140,7 +139,7 @@ void *calloc(size_t size, size_t nmemb) ...@@ -140,7 +139,7 @@ void *calloc(size_t size, size_t nmemb)
* No need to zero the heap, the MAP_ANONYMOUS in malloc() * No need to zero the heap, the MAP_ANONYMOUS in malloc()
* already does it. * already does it.
*/ */
return malloc(res); return malloc(x);
} }
static __attribute__((unused)) static __attribute__((unused))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment