mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-22 06:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

sysstat: Fix CVE-2023-33204

Browse Source 
Upstream-Status: Backport from https://github.com/sysstat/sysstat/commit/954ff2e2673c

(From OE-Core rev: d4ee3ad88392dbcb4284be48ef9fd0bbff979cca)

Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
Hitendra Prajapati
2023-05-31 12:24:02 +05:30
committed by Steve Sakoman
parent 1e6f147c68
commit 3c6eb39773
2 changed files with 83 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
meta/recipes-extended/sysstat/sysstat/CVE-2023-33204.patch Normal file
View File

@@ -0,0 +1,80 @@
From e806a902cc90a0b87da00854de8d5fd8222540fc Mon Sep 17 00:00:00 2001
From: Pavel Kopylov <pkopylov@>
Date: Wed, 17 May 2023 11:33:45 +0200
Subject: [PATCH] Fix an overflow which is still possible for some values.
Upstream-Status: Backport [https://github.com/sysstat/sysstat/commit/954ff2e2673c]
CVE: CVE-2023-33204
Signed-off-by: Xiangyu Chen <xiangyu.chen@...>
Signed-off-by: Sanjay Chitroda <schitrod@...>
Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
---
common.c | 18 ++++++++++--------
common.h | 2 +-
sa_common.c | 4 ++--
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/common.c b/common.c
index db9b0ed..e05c5bb 100644
--- a/common.c
+++ b/common.c
@@ -1640,17 +1640,19 @@ int parse_values(char *strargv, unsigned char bitmap[], int max_val, const char
* @val3 Third value.
***************************************************************************
*/
-void check_overflow(size_t val1, size_t val2, size_t val3)
+void check_overflow(unsigned int val1, unsigned int val2,
+ unsigned int val3)
{
- if ((unsigned long long) val1 *
- (unsigned long long) val2 *
- (unsigned long long) val3 > UINT_MAX) {
+ if ((val1 != 0) && (val2 != 0) && (val3 != 0) &&
+ (((unsigned long long) UINT_MAX / (unsigned long long) val1 <
+ (unsigned long long) val2) ||
+ ((unsigned long long) UINT_MAX / ((unsigned long long) val1 * (unsigned long long) val2) <
+ (unsigned long long) val3))) {
#ifdef DEBUG
- fprintf(stderr, "%s: Overflow detected (%llu). Aborting...\n",
- __FUNCTION__,
- (unsigned long long) val1 * (unsigned long long) val2 * (unsigned long long) val3);
+ fprintf(stderr, "%s: Overflow detected (%u,%u,%u). Aborting...\n",
+ __FUNCTION__, val1, val2, val3);
#endif
- exit(4);
+ exit(4);
}
}
diff --git a/common.h b/common.h
index 0ac5896..b2ffe9f 100644
--- a/common.h
+++ b/common.h
@@ -256,7 +256,7 @@ int check_dir
#ifndef SOURCE_SADC
void check_overflow
- (size_t, size_t, size_t);
+ (unsigned int, unsigned int, unsigned int);
int count_bits
(void *, int);
int count_csvalues
diff --git a/sa_common.c b/sa_common.c
index 1b8fcaa..1144cfe 100644
--- a/sa_common.c
+++ b/sa_common.c
@@ -452,8 +452,8 @@ void allocate_structures(struct activity *act[])
if (act[i]->nr_ini > 0) {
/* Look for a possible overflow */
- check_overflow((size_t) act[i]->msize, (size_t) act[i]->nr_ini,
- (size_t) act[i]->nr2);
+ check_overflow((unsigned int) act[i]->msize, (unsigned int) act[i]->nr_ini,
+ (unsigned int) act[i]->nr2);
for (j = 0; j < 3; j++) {
SREALLOC(act[i]->buf[j], void,
--
2.25.1

5
meta/recipes-extended/sysstat/sysstat_12.4.5.bb
View File

@@ -3,6 +3,7 @@ require sysstat.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb"
SRC_URI += "file://0001-configure.in-remove-check-for-chkconfig.patch \
file://CVE-2022-39377.patch"
file://CVE-2022-39377.patch \
file://CVE-2023-33204.patch \
"
SRC_URI[sha256sum] = "ef445acea301bbb996e410842f6290a8d049e884d4868cfef7e85dc04b7eee5b"