diff options
| author |   Marek Szuba <marecki@gentoo.org> | 2023-05-23 21:23:23 +0200 |
|---|---|---|
| committer | Marek Szuba <marecki@gentoo.org> | 2023-05-23 21:39:35 +0200 |
| commit | ecf13248bdaba63272a52d2678ce688ffb161a9d (patch) | |
| tree | 9cd15e9b52b883fb385b2f8404518e551d20a431 /app-admin/sysstat/files | |
| parent | dev-ml/dune: add 3.8.0 (diff) | |
| download | gentoo-ecf13248bdaba63272a52d2678ce688ffb161a9d.tar.gz gentoo-ecf13248bdaba63272a52d2678ce688ffb161a9d.tar.bz2 gentoo-ecf13248bdaba63272a52d2678ce688ffb161a9d.zip | |
app-admin/sysstat: backport second part of CVE-2022-39377 fix
Bug: https://bugs.gentoo.org/880543
Signed-off-by: Marek Szuba <marecki@gentoo.org>
Diffstat (limited to 'app-admin/sysstat/files')
| -rw-r--r-- | app-admin/sysstat/files/sysstat-12.6.2-check_overflow.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/app-admin/sysstat/files/sysstat-12.6.2-check_overflow.patch b/app-admin/sysstat/files/sysstat-12.6.2-check_overflow.patch new file mode 100644 index 000000000000..3f36fd7ff090 --- /dev/null +++ b/app-admin/sysstat/files/sysstat-12.6.2-check_overflow.patch @@ -0,0 +1,18 @@ +Backported upstream fix for the fix for CVE-2022-39377. + +--- a/common.c ++++ b/common.c +@@ -431,8 +431,11 @@ int check_dir(char *dirname) + 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 * |