Blame sysstat-12.5.4-CVE-2023-33204.patch
|
Pavel Šimovec |
26bbb5 |
From 954ff2e2673cef48f0ed44668c466eab041db387 Mon Sep 17 00:00:00 2001
|
|
Pavel Šimovec |
26bbb5 |
From: Pavel Kopylov <pkopylov@cloudlinux.com>
|
|
Pavel Šimovec |
26bbb5 |
Date: Wed, 17 May 2023 11:33:45 +0200
|
|
Pavel Šimovec |
26bbb5 |
Subject: [PATCH] Fix an overflow which is still possible for some values.
|
|
Pavel Šimovec |
26bbb5 |
diff --git a/common.c b/common.c
|
|
Pavel Šimovec |
26bbb5 |
index 583a0ca..6d73b1b 100644
|
|
Pavel Šimovec |
26bbb5 |
--- a/common.c
|
|
Pavel Šimovec |
26bbb5 |
+++ b/common.c
|
|
Pavel Šimovec |
26bbb5 |
@@ -1639,9 +1639,11 @@ int parse_values(char *strargv, unsigned char bitmap[], int max_val, const char
|
|
Pavel Šimovec |
26bbb5 |
*/
|
|
Pavel Šimovec |
26bbb5 |
void check_overflow(size_t val1, size_t val2, size_t val3)
|
|
Pavel Šimovec |
26bbb5 |
{
|
|
Pavel Šimovec |
26bbb5 |
- if ((unsigned long long) val1 *
|
|
Pavel Šimovec |
26bbb5 |
- (unsigned long long) val2 *
|
|
Pavel Šimovec |
26bbb5 |
- (unsigned long long) val3 > UINT_MAX) {
|
|
Pavel Šimovec |
26bbb5 |
+if ((val1 != 0) && (val2 != 0) && (val3 != 0) &&
|
|
Pavel Šimovec |
26bbb5 |
+ (((unsigned long long)UINT_MAX / (unsigned long long)val1 <
|
|
Pavel Šimovec |
26bbb5 |
+ (unsigned long long)val2) ||
|
|
Pavel Šimovec |
26bbb5 |
+ ((unsigned long long)UINT_MAX / ((unsigned long long)val1 *
|
|
Pavel Šimovec |
26bbb5 |
+ (unsigned long long)val2) < (unsigned long long)val3))) {
|
|
Pavel Šimovec |
26bbb5 |
#ifdef DEBUG
|
|
Pavel Šimovec |
26bbb5 |
fprintf(stderr, "%s: Overflow detected (%llu). Aborting...\n",
|
|
Pavel Šimovec |
26bbb5 |
__FUNCTION__,
|