Compare commits
No commits in common. "imports/c8-beta/sysstat-11.7.3-7.el8" and "c8" have entirely different histories.
imports/c8
...
c8
234
SOURCES/0001-Add-more-overflow-checks.patch
Normal file
234
SOURCES/0001-Add-more-overflow-checks.patch
Normal file
@ -0,0 +1,234 @@
|
|||||||
|
From c9a11d35df4aecfcf22aef827bac6cd57def9d4e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Sebastien GODARD <sysstat@users.noreply.github.com>
|
||||||
|
Date: Sun, 23 Oct 2022 16:22:28 +0200
|
||||||
|
Subject: [PATCH] Add more overflow checks
|
||||||
|
|
||||||
|
Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
|
||||||
|
|
||||||
|
Cherry-picked-by: Lukáš Zaoral <lzaoral@redhat.com>
|
||||||
|
Upstream-commit: c9a11d35df4aecfcf22aef827bac6cd57def9d4e
|
||||||
|
---
|
||||||
|
diff --git a/common.c b/common.c
|
||||||
|
index 1a84b052..27249772 100644
|
||||||
|
--- a/common.c
|
||||||
|
+++ b/common.c
|
||||||
|
@@ -274,6 +274,28 @@ void sysstat_panic(const char *function, int error_code)
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
+/*
|
||||||
|
+ * **************************************************************************
|
||||||
|
+ * Check if the multiplication of the 3 values may be greater than UINT_MAX.
|
||||||
|
+ *
|
||||||
|
+ * IN:
|
||||||
|
+ * @val1 First value.
|
||||||
|
+ * @val2 Second value.
|
||||||
|
+ * @val3 Third value.
|
||||||
|
+ ***************************************************************************
|
||||||
|
+ */
|
||||||
|
+void check_overflow(unsigned long long val1, unsigned long long val2,
|
||||||
|
+ unsigned long long val3)
|
||||||
|
+{
|
||||||
|
+ if (val1 * val2 * val3 > UINT_MAX) {
|
||||||
|
+#ifdef DEBUG
|
||||||
|
+ fprintf(stderr, "%s: Overflow detected (%llu). Aborting...\n",
|
||||||
|
+ __FUNCTION__, val1 * val2 * val3);
|
||||||
|
+#endif
|
||||||
|
+ exit(4);
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
#ifndef SOURCE_SADC
|
||||||
|
/*
|
||||||
|
***************************************************************************
|
||||||
|
@@ -1656,28 +1677,4 @@ int parse_values(char *strargv, unsigned char bitmap[], int max_val, const char
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
-/*
|
||||||
|
- ***************************************************************************
|
||||||
|
- * Check if the multiplication of the 3 values may be greater than UINT_MAX.
|
||||||
|
- *
|
||||||
|
- * IN:
|
||||||
|
- * @val1 First value.
|
||||||
|
- * @val2 Second value.
|
||||||
|
- * @val3 Third value.
|
||||||
|
- ***************************************************************************
|
||||||
|
- */
|
||||||
|
-void check_overflow(size_t val1, size_t val2, size_t val3)
|
||||||
|
-{
|
||||||
|
- if ((unsigned long long) val1 *
|
||||||
|
- (unsigned long long) val2 *
|
||||||
|
- (unsigned long long) val3 > UINT_MAX) {
|
||||||
|
-#ifdef DEBUG
|
||||||
|
- fprintf(stderr, "%s: Overflow detected (%llu). Aborting...\n",
|
||||||
|
- __FUNCTION__,
|
||||||
|
- (unsigned long long) val1 * (unsigned long long) val2 * (unsigned long long) val3);
|
||||||
|
-#endif
|
||||||
|
- exit(4);
|
||||||
|
- }
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
#endif /* SOURCE_SADC undefined */
|
||||||
|
diff --git a/common.h b/common.h
|
||||||
|
index e8ab98ab..715b2da2 100644
|
||||||
|
--- a/common.h
|
||||||
|
+++ b/common.h
|
||||||
|
@@ -241,10 +241,10 @@ int is_device
|
||||||
|
(char *, int);
|
||||||
|
void sysstat_panic
|
||||||
|
(const char *, int);
|
||||||
|
+void check_overflow
|
||||||
|
+ (unsigned long long, unsigned long long, unsigned long long);
|
||||||
|
|
||||||
|
#ifndef SOURCE_SADC
|
||||||
|
-void check_overflow
|
||||||
|
- (size_t, size_t, size_t);
|
||||||
|
int count_bits
|
||||||
|
(void *, int);
|
||||||
|
int count_csvalues
|
||||||
|
diff --git a/sa_common.c b/sa_common.c
|
||||||
|
index b2cec4ad..3460257a 100644
|
||||||
|
--- a/sa_common.c
|
||||||
|
+++ b/sa_common.c
|
||||||
|
@@ -463,8 +463,9 @@ 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 long long) act[i]->msize,
|
||||||
|
+ (unsigned long long) act[i]->nr_ini,
|
||||||
|
+ (unsigned long long) act[i]->nr2);
|
||||||
|
|
||||||
|
for (j = 0; j < 3; j++) {
|
||||||
|
SREALLOC(act[i]->buf[j], void,
|
||||||
|
@@ -529,6 +530,10 @@ void reallocate_all_buffers(struct activity *a, __nr_t nr_min)
|
||||||
|
while (nr_realloc < nr_min);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ /* Look for a possible overflow */
|
||||||
|
+ check_overflow((unsigned long long) a->msize, nr_realloc,
|
||||||
|
+ (unsigned long long) a->nr2);
|
||||||
|
+
|
||||||
|
for (j = 0; j < 3; j++) {
|
||||||
|
SREALLOC(a->buf[j], void,
|
||||||
|
(size_t) a->msize * nr_realloc * (size_t) a->nr2);
|
||||||
|
diff --git a/sadc.c b/sadc.c
|
||||||
|
index 3458d089..123bf8e0 100644
|
||||||
|
--- a/sadc.c
|
||||||
|
+++ b/sadc.c
|
||||||
|
@@ -360,6 +360,12 @@ void sa_sys_init(void)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (IS_COLLECTED(act[i]->options) && (act[i]->nr_ini > 0)) {
|
||||||
|
+
|
||||||
|
+ /* Look for a possible overflow */
|
||||||
|
+ check_overflow((unsigned long long) act[i]->msize,
|
||||||
|
+ (unsigned long long) act[i]->nr_ini,
|
||||||
|
+ (unsigned long long) act[i]->nr2);
|
||||||
|
+
|
||||||
|
/* Allocate structures for current activity (using nr_ini and nr2 results) */
|
||||||
|
SREALLOC(act[i]->_buf0, void,
|
||||||
|
(size_t) act[i]->msize * (size_t) act[i]->nr_ini * (size_t) act[i]->nr2);
|
||||||
|
--
|
||||||
|
2.45.0
|
||||||
|
|
||||||
|
From 44f1dc159242c1e434a3b836cda49f084c5a96cc Mon Sep 17 00:00:00 2001
|
||||||
|
From: Sebastien GODARD <sysstat@users.noreply.github.com>
|
||||||
|
Date: Sun, 6 Nov 2022 15:48:16 +0100
|
||||||
|
Subject: [PATCH] Make sure values to be compared are unsigned integers
|
||||||
|
|
||||||
|
It seems safer to make sure that input values are unsigned int before
|
||||||
|
casting them to unsigned long long and making the comparison.
|
||||||
|
|
||||||
|
Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
|
||||||
|
|
||||||
|
Cherry-picked-by: Lukáš Zaoral <lzaoral@redhat.com>
|
||||||
|
Upstream-commit: 44f1dc159242c1e434a3b836cda49f084c5a96cc
|
||||||
|
---
|
||||||
|
diff --git a/common.c b/common.c
|
||||||
|
index 27249772..3b7fdcd5 100644
|
||||||
|
--- a/common.c
|
||||||
|
+++ b/common.c
|
||||||
|
@@ -425,13 +425,15 @@ int check_dir(char *dirname)
|
||||||
|
* @val3 Third value.
|
||||||
|
***************************************************************************
|
||||||
|
*/
|
||||||
|
-void check_overflow(unsigned long long val1, unsigned long long val2,
|
||||||
|
- unsigned long long val3)
|
||||||
|
+void check_overflow(unsigned int val1, unsigned int val2,
|
||||||
|
+ unsigned int val3)
|
||||||
|
{
|
||||||
|
- if (val1 * val2 * val3 > UINT_MAX) {
|
||||||
|
+ if ((unsigned long long) val1 * (unsigned long long) val2 *
|
||||||
|
+ (unsigned long long) val3 > UINT_MAX) {
|
||||||
|
#ifdef DEBUG
|
||||||
|
fprintf(stderr, "%s: Overflow detected (%llu). Aborting...\n",
|
||||||
|
- __FUNCTION__, val1 * val2 * val3);
|
||||||
|
+ __FUNCTION__, (unsigned long long) val1 * (unsigned long long) val2 *
|
||||||
|
+ (unsigned long long) val3);
|
||||||
|
#endif
|
||||||
|
exit(4);
|
||||||
|
}
|
||||||
|
diff --git a/common.h b/common.h
|
||||||
|
index 715b2da2..fc8a1a0d 100644
|
||||||
|
--- a/common.h
|
||||||
|
+++ b/common.h
|
||||||
|
@@ -241,7 +241,7 @@ int is_device
|
||||||
|
void sysstat_panic
|
||||||
|
(const char *, int);
|
||||||
|
void check_overflow
|
||||||
|
- (unsigned long long, unsigned long long, unsigned long long);
|
||||||
|
+ (unsigned int, unsigned int, unsigned int);
|
||||||
|
|
||||||
|
#ifndef SOURCE_SADC
|
||||||
|
int count_bits
|
||||||
|
diff --git a/sa_common.c b/sa_common.c
|
||||||
|
index 3460257a..0ca8b039 100644
|
||||||
|
--- a/sa_common.c
|
||||||
|
+++ b/sa_common.c
|
||||||
|
@@ -463,9 +463,9 @@ void allocate_structures(struct activity *act[])
|
||||||
|
if (act[i]->nr_ini > 0) {
|
||||||
|
|
||||||
|
/* Look for a possible overflow */
|
||||||
|
- check_overflow((unsigned long long) act[i]->msize,
|
||||||
|
- (unsigned long long) act[i]->nr_ini,
|
||||||
|
- (unsigned long long) 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,
|
||||||
|
@@ -531,8 +531,8 @@ void reallocate_all_buffers(struct activity *a, __nr_t nr_min)
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Look for a possible overflow */
|
||||||
|
- check_overflow((unsigned long long) a->msize, nr_realloc,
|
||||||
|
- (unsigned long long) a->nr2);
|
||||||
|
+ check_overflow((unsigned int) a->msize, (unsigned int) nr_realloc,
|
||||||
|
+ (unsigned int) a->nr2);
|
||||||
|
|
||||||
|
for (j = 0; j < 3; j++) {
|
||||||
|
SREALLOC(a->buf[j], void,
|
||||||
|
diff --git a/sadc.c b/sadc.c
|
||||||
|
index 123bf8e0..40a1e15b 100644
|
||||||
|
--- a/sadc.c
|
||||||
|
+++ b/sadc.c
|
||||||
|
@@ -362,9 +362,9 @@ void sa_sys_init(void)
|
||||||
|
if (IS_COLLECTED(act[i]->options) && (act[i]->nr_ini > 0)) {
|
||||||
|
|
||||||
|
/* Look for a possible overflow */
|
||||||
|
- check_overflow((unsigned long long) act[i]->msize,
|
||||||
|
- (unsigned long long) act[i]->nr_ini,
|
||||||
|
- (unsigned long long) act[i]->nr2);
|
||||||
|
+ check_overflow((unsigned int) act[i]->msize,
|
||||||
|
+ (unsigned int) act[i]->nr_ini,
|
||||||
|
+ (unsigned int) act[i]->nr2);
|
||||||
|
|
||||||
|
/* Allocate structures for current activity (using nr_ini and nr2 results) */
|
||||||
|
SREALLOC(act[i]->_buf0, void,
|
||||||
|
--
|
||||||
|
2.45.0
|
||||||
|
|
63
SOURCES/0001-mpstat-incorrect-cpu-usage-iowait.patch
Normal file
63
SOURCES/0001-mpstat-incorrect-cpu-usage-iowait.patch
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
From 1f5949d4a6fcb33065dbb1d509f356db039998ed Mon Sep 17 00:00:00 2001
|
||||||
|
From: Sebastien GODARD <sysstat@users.noreply.github.com>
|
||||||
|
Date: Wed, 2 Sep 2020 19:04:04 +0200
|
||||||
|
Subject: [PATCH] Workaround for iowait being decremented
|
||||||
|
|
||||||
|
The iowait value reported by the kernel on NO_HZ systems can decrement
|
||||||
|
as a result of inaccurate iowait tracking. Waiting on IO can be first
|
||||||
|
accounted as iowait but then instead as idle.
|
||||||
|
|
||||||
|
Function get_per_cpu_interval() considers iowait going backwards between
|
||||||
|
two readings as a CPU coming back online and resets the iowait value of
|
||||||
|
the first reading to 0. If iowait is decremented only because of
|
||||||
|
inaccurate tracking, this causes that almost all time between the two
|
||||||
|
readings is incorrectly recognized by sar as being spent in iowait.
|
||||||
|
|
||||||
|
The patch updates the code in get_per_cpu_interval() to recognize this
|
||||||
|
situation. If the iowait value between two readings decremented but the
|
||||||
|
idle value did not then the code now considers it as a problem with the
|
||||||
|
iowait reporting and corrects the first value according to the second
|
||||||
|
reading. Otherwise, the code remains treating decremented iowait as a
|
||||||
|
CPU coming back online.
|
||||||
|
|
||||||
|
Fixes #14.
|
||||||
|
|
||||||
|
Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
|
||||||
|
---
|
||||||
|
rd_stats.c | 20 +++++++++++++++++---
|
||||||
|
1 file changed, 17 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/rd_stats.c b/rd_stats.c
|
||||||
|
index 56d42d00..fb93f23f 100644
|
||||||
|
--- a/rd_stats.c
|
||||||
|
+++ b/rd_stats.c
|
||||||
|
@@ -440,12 +440,26 @@ unsigned long long get_per_cpu_interval(struct stats_cpu *scc,
|
||||||
|
* value was greater than ULLONG_MAX - 0x7ffff (the counter probably
|
||||||
|
* overflew).
|
||||||
|
*/
|
||||||
|
+ if ((scc->cpu_iowait < scp->cpu_iowait) && (scp->cpu_iowait < (ULLONG_MAX - 0x7ffff))) {
|
||||||
|
+ /*
|
||||||
|
+ * The iowait value reported by the kernel can also decrement as
|
||||||
|
+ * a result of inaccurate iowait tracking. Waiting on IO can be
|
||||||
|
+ * first accounted as iowait but then instead as idle.
|
||||||
|
+ * Therefore if the idle value during the same period did not
|
||||||
|
+ * decrease then consider this is a problem with the iowait
|
||||||
|
+ * reporting and correct the previous value according to the new
|
||||||
|
+ * reading. Otherwise, treat this as CPU coming back online.
|
||||||
|
+ */
|
||||||
|
+ if ((scc->cpu_idle > scp->cpu_idle) || (scp->cpu_idle >= (ULLONG_MAX - 0x7ffff))) {
|
||||||
|
+ scp->cpu_iowait = scc->cpu_iowait;
|
||||||
|
+ }
|
||||||
|
+ else {
|
||||||
|
+ scp->cpu_iowait = 0;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
if ((scc->cpu_idle < scp->cpu_idle) && (scp->cpu_idle < (ULLONG_MAX - 0x7ffff))) {
|
||||||
|
scp->cpu_idle = 0;
|
||||||
|
}
|
||||||
|
- if ((scc->cpu_iowait < scp->cpu_iowait) && (scp->cpu_iowait < (ULLONG_MAX - 0x7ffff))) {
|
||||||
|
- scp->cpu_iowait = 0;
|
||||||
|
- }
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Don't take cpu_guest and cpu_guest_nice into account
|
@ -0,0 +1,28 @@
|
|||||||
|
From 06e226703bee77e507f9f480807e230f677f0cb9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Sdrkun <shanzhikun@gmail.com>
|
||||||
|
Date: Tue, 28 Apr 2020 10:31:54 -0400
|
||||||
|
Subject: [PATCH] sa1: fix sar error when the directory var/log/sa was removed.
|
||||||
|
|
||||||
|
Signed-off-by: Sdrkun <shanzhikun@gmail.com>
|
||||||
|
|
||||||
|
Cherry-picked-by: Lukáš Zaoral <lzaoral@redhat.com>
|
||||||
|
Upstream-commit: 06e226703bee77e507f9f480807e230f677f0cb9
|
||||||
|
---
|
||||||
|
sa1.in | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/sa1.in b/sa1.in
|
||||||
|
index e908ad33..e9047d06 100644
|
||||||
|
--- a/sa1.in
|
||||||
|
+++ b/sa1.in
|
||||||
|
@@ -16,6 +16,7 @@
|
||||||
|
|
||||||
|
[ -r ${SYSCONFIG_DIR}/sysstat ] && . ${SYSCONFIG_DIR}/sysstat
|
||||||
|
[ -d ${SA_DIR} ] || SA_DIR=@SA_DIR@
|
||||||
|
+[ -d @SA_DIR@ ] || mkdir @SA_DIR@
|
||||||
|
|
||||||
|
if [ ${HISTORY} -gt 28 ]
|
||||||
|
then
|
||||||
|
--
|
||||||
|
2.43.0
|
||||||
|
|
101
SOURCES/0001-sadc-Add-a-f-flag-to-force-fdatasync-use.patch
Normal file
101
SOURCES/0001-sadc-Add-a-f-flag-to-force-fdatasync-use.patch
Normal file
@ -0,0 +1,101 @@
|
|||||||
|
From 560d88cb5a16636acb0e350d6997fe915cc4253e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Kyle Walker <kwalker@redhat.com>
|
||||||
|
Date: Wed, 30 Jan 2019 07:50:55 -0500
|
||||||
|
Subject: [PATCH] sadc: Add a -f flag to force fdatasync() use
|
||||||
|
|
||||||
|
For quite some time, the sadc utility has not used fdatasync() when writing
|
||||||
|
stat information to disk. This resulted in instances where data files could
|
||||||
|
be corrupted or entries lost if a system encountered a sudden reset
|
||||||
|
condition. This change adds a "-f" flag which can be used to bring back the
|
||||||
|
previous behaviour if end users require it.
|
||||||
|
|
||||||
|
Note, the fdatasync() lowers the likelihood of lost data, but does so at
|
||||||
|
the expense of performance within the write operation.
|
||||||
|
---
|
||||||
|
man/sadc.in | 8 +++++++-
|
||||||
|
sa.h | 2 ++
|
||||||
|
sadc.c | 13 ++++++++++++-
|
||||||
|
3 files changed, 21 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/man/sadc.in b/man/sadc.in
|
||||||
|
index 2d754b71..ce8ee230 100644
|
||||||
|
--- a/man/sadc.in
|
||||||
|
+++ b/man/sadc.in
|
||||||
|
@@ -4,7 +4,7 @@ sadc \- System activity data collector.
|
||||||
|
.SH SYNOPSIS
|
||||||
|
.B @SA_LIB_DIR@/sadc [ -C
|
||||||
|
.I comment
|
||||||
|
-.B ] [ -D ] [ -F ] [ -L ] [ -V ] [ -S { DISK | INT | IPV6 | POWER | SNMP | XDISK | ALL | XALL [,...] } ] [
|
||||||
|
+.B ] [ -D ] [ -F ] [ -L ] [ -V ] [ -f ] [ -S { DISK | INT | IPV6 | POWER | SNMP | XDISK | ALL | XALL [,...] } ] [
|
||||||
|
.I interval
|
||||||
|
.B [
|
||||||
|
.I count
|
||||||
|
@@ -106,6 +106,12 @@ then it will be truncated. This may be useful for daily data files
|
||||||
|
created by an older version of
|
||||||
|
.B sadc
|
||||||
|
and whose format is no longer compatible with current one.
|
||||||
|
+.IP -f
|
||||||
|
+fdatasync() will be used to ensure data is written to disk. This differs
|
||||||
|
+from the normal operation in that a sudden system reset is less likely to
|
||||||
|
+result in the saDD datafiles being corrupted. However, this is at the
|
||||||
|
+expense of performance within the sadc process as forward progress will be
|
||||||
|
+blocked while data is written to underlying disk instead of just to cache.
|
||||||
|
.IP -L
|
||||||
|
.B sadc
|
||||||
|
will try to get an exclusive lock on the
|
||||||
|
diff --git a/sa.h b/sa.h
|
||||||
|
index 1cd0c3d9..d3236f7c 100644
|
||||||
|
--- a/sa.h
|
||||||
|
+++ b/sa.h
|
||||||
|
@@ -110,5 +110,6 @@
|
||||||
|
#define S_F_HUMAN_READ 0x01000000
|
||||||
|
#define S_F_ZERO_OMIT 0x02000000
|
||||||
|
+#define S_F_FDATASYNC 0x08000000
|
||||||
|
|
||||||
|
#define WANT_SINCE_BOOT(m) (((m) & S_F_SINCE_BOOT) == S_F_SINCE_BOOT)
|
||||||
|
#define WANT_SA_ROTAT(m) (((m) & S_F_SA_ROTAT) == S_F_SA_ROTAT)
|
||||||
|
@@ -138,5 +139,6 @@
|
||||||
|
#define PACK_VIEWS(m) (((m) & S_F_SVG_PACKED) == S_F_SVG_PACKED)
|
||||||
|
#define DISPLAY_HUMAN_READ(m) (((m) & S_F_HUMAN_READ) == S_F_HUMAN_READ)
|
||||||
|
+#define FDATASYNC(m) (((m) & S_F_FDATASYNC) == S_F_FDATASYNC)
|
||||||
|
|
||||||
|
#define AO_F_NULL 0x00000000
|
||||||
|
|
||||||
|
diff --git a/sadc.c b/sadc.c
|
||||||
|
index 826f4aed..139d490a 100644
|
||||||
|
--- a/sadc.c
|
||||||
|
+++ b/sadc.c
|
||||||
|
@@ -92,7 +92,7 @@ void usage(char *progname)
|
||||||
|
progname);
|
||||||
|
|
||||||
|
fprintf(stderr, _("Options are:\n"
|
||||||
|
- "[ -C <comment> ] [ -D ] [ -F ] [ -L ] [ -V ]\n"
|
||||||
|
+ "[ -C <comment> ] [ -D ] [ -F ] [ -L ] [ -V ] [ -f ]\n"
|
||||||
|
"[ -S { INT | DISK | IPV6 | POWER | SNMP | XDISK | ALL | XALL } ]\n"));
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
@@ -1109,6 +1109,13 @@ void rw_sa_stat_loop(long count, int stdfd, int ofd, char ofile[],
|
||||||
|
|
||||||
|
/* Flush data */
|
||||||
|
fflush(stdout);
|
||||||
|
+ if (FDATASYNC(flags)) {
|
||||||
|
+ /* If indicated, sync the data to media */
|
||||||
|
+ if (fdatasync(ofd) < 0) {
|
||||||
|
+ perror("fdatasync");
|
||||||
|
+ exit(4);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
|
||||||
|
if (count > 0) {
|
||||||
|
count--;
|
||||||
|
@@ -1206,6 +1213,10 @@ int main(int argc, char **argv)
|
||||||
|
optz = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ else if (!strcmp(argv[opt], "-f")) {
|
||||||
|
+ flags |= S_F_FDATASYNC;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
else if (!strcmp(argv[opt], "-C")) {
|
||||||
|
if (!argv[++opt]) {
|
||||||
|
usage(argv[0]);
|
@ -0,0 +1,85 @@
|
|||||||
|
From 9c4eaf150662ad40607923389d4519bc83b93540 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Sebastien <seb@fedora-2.home>
|
||||||
|
Date: Sat, 15 Oct 2022 14:24:22 +0200
|
||||||
|
Subject: [PATCH] Fix size_t overflow in sa_common.c (GHSL-2022-074)
|
||||||
|
|
||||||
|
allocate_structures function located in sa_common.c insufficiently
|
||||||
|
checks bounds before arithmetic multiplication allowing for an
|
||||||
|
overflow in the size allocated for the buffer representing system
|
||||||
|
activities.
|
||||||
|
|
||||||
|
This patch checks that the post-multiplied value is not greater than
|
||||||
|
UINT_MAX.
|
||||||
|
|
||||||
|
Signed-off-by: Sebastien <seb@fedora-2.home>
|
||||||
|
---
|
||||||
|
common.c | 25 +++++++++++++++++++++++++
|
||||||
|
common.h | 2 ++
|
||||||
|
sa_common.c | 6 ++++++
|
||||||
|
3 files changed, 33 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/common.c b/common.c
|
||||||
|
index 81c77624..1a84b052 100644
|
||||||
|
--- a/common.c
|
||||||
|
+++ b/common.c
|
||||||
|
@@ -1655,4 +1655,29 @@ int parse_values(char *strargv, unsigned char bitmap[], int max_val, const char
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+/*
|
||||||
|
+ ***************************************************************************
|
||||||
|
+ * Check if the multiplication of the 3 values may be greater than UINT_MAX.
|
||||||
|
+ *
|
||||||
|
+ * IN:
|
||||||
|
+ * @val1 First value.
|
||||||
|
+ * @val2 Second value.
|
||||||
|
+ * @val3 Third value.
|
||||||
|
+ ***************************************************************************
|
||||||
|
+ */
|
||||||
|
+void check_overflow(size_t val1, size_t val2, size_t val3)
|
||||||
|
+{
|
||||||
|
+ if ((unsigned long long) val1 *
|
||||||
|
+ (unsigned long long) val2 *
|
||||||
|
+ (unsigned long long) val3 > UINT_MAX) {
|
||||||
|
+#ifdef DEBUG
|
||||||
|
+ fprintf(stderr, "%s: Overflow detected (%llu). Aborting...\n",
|
||||||
|
+ __FUNCTION__,
|
||||||
|
+ (unsigned long long) val1 * (unsigned long long) val2 * (unsigned long long) val3);
|
||||||
|
+#endif
|
||||||
|
+ exit(4);
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
#endif /* SOURCE_SADC undefined */
|
||||||
|
diff --git a/common.h b/common.h
|
||||||
|
index 55b6657d..e8ab98ab 100644
|
||||||
|
--- a/common.h
|
||||||
|
+++ b/common.h
|
||||||
|
@@ -260,6 +260,8 @@ int check_dir
|
||||||
|
(const char *, int);
|
||||||
|
|
||||||
|
#ifndef SOURCE_SADC
|
||||||
|
+void check_overflow
|
||||||
|
+ (size_t, size_t, size_t);
|
||||||
|
int count_bits
|
||||||
|
(void *, int);
|
||||||
|
int count_csvalues
|
||||||
|
diff --git a/sa_common.c b/sa_common.c
|
||||||
|
index 3699a840..b2cec4ad 100644
|
||||||
|
--- a/sa_common.c
|
||||||
|
+++ b/sa_common.c
|
||||||
|
@@ -459,7 +459,13 @@ void allocate_structures(struct activity *act[])
|
||||||
|
int i, j;
|
||||||
|
|
||||||
|
for (i = 0; i < NR_ACT; i++) {
|
||||||
|
+
|
||||||
|
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);
|
||||||
|
+
|
||||||
|
for (j = 0; j < 3; j++) {
|
||||||
|
SREALLOC(act[i]->buf[j], void,
|
||||||
|
(size_t) act[i]->msize * (size_t) act[i]->nr_ini * (size_t) act[i]->nr2);
|
38
SOURCES/CVE-2023-33204.patch
Normal file
38
SOURCES/CVE-2023-33204.patch
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
commit 6f8dc568e6ab072bb8205b732f04e685bf9237c0
|
||||||
|
Merge: c43167cc 954ff2e2
|
||||||
|
Author: Sebastien GODARD <sysstat@users.noreply.github.com>
|
||||||
|
Date: Wed May 17 21:10:31 2023 +0200
|
||||||
|
|
||||||
|
Merge branch 'pkopylov-master'
|
||||||
|
|
||||||
|
Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
|
||||||
|
|
||||||
|
diff --git a/common.c b/common.c
|
||||||
|
index 48493b5f..0efe7ee3 100644
|
||||||
|
--- a/common.c
|
||||||
|
+++ b/common.c
|
||||||
|
@@ -431,15 +431,17 @@ 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 *
|
||||||
|
- (unsigned long long) val3);
|
||||||
|
+ fprintf(stderr, "%s: Overflow detected (%u,%u,%u). Aborting...\n",
|
||||||
|
+ __FUNCTION__, val1, val2, val3);
|
||||||
|
#endif
|
||||||
|
- exit(4);
|
||||||
|
- }
|
||||||
|
+ exit(4);
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifndef SOURCE_SADC
|
@ -1,7 +1,7 @@
|
|||||||
Summary: Collection of performance monitoring tools for Linux
|
Summary: Collection of performance monitoring tools for Linux
|
||||||
Name: sysstat
|
Name: sysstat
|
||||||
Version: 11.7.3
|
Version: 11.7.3
|
||||||
Release: 7%{?dist}
|
Release: 13%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
URL: http://sebastien.godard.pagesperso-orange.fr/
|
URL: http://sebastien.godard.pagesperso-orange.fr/
|
||||||
@ -17,6 +17,16 @@ Patch02: 0001-ignoring-autofs-as-real-filesystem-by-counting-numbe.patch
|
|||||||
Patch03: 0001-sar-Add-missing-gnice-CPU-value-for-tickless-CPU.patch
|
Patch03: 0001-sar-Add-missing-gnice-CPU-value-for-tickless-CPU.patch
|
||||||
Patch04: 0001-sadf-Fix-seg-fault-on-empty-data-files.patch
|
Patch04: 0001-sadf-Fix-seg-fault-on-empty-data-files.patch
|
||||||
Patch05: 0001-sar-Fix-typo-in-manual-page.patch
|
Patch05: 0001-sar-Fix-typo-in-manual-page.patch
|
||||||
|
Patch06: CVE-2022-39377-arithmetic-overflow-in-allocate-structures-on-32-bit-systems.patch
|
||||||
|
Patch07: 0001-sadc-Add-a-f-flag-to-force-fdatasync-use.patch
|
||||||
|
Patch08: 0001-mpstat-incorrect-cpu-usage-iowait.patch
|
||||||
|
Patch09: 0001-sa1-fix-sar-error-when-the-directory-var-log-sa-was-.patch
|
||||||
|
|
||||||
|
# https://github.com/sysstat/sysstat/commit/c9a11d35df4aecfcf22aef827bac6cd57def9d4e
|
||||||
|
# https://github.com/sysstat/sysstat/commit/44f1dc159242c1e434a3b836cda49f084c5a96cc
|
||||||
|
Patch10: 0001-Add-more-overflow-checks.patch
|
||||||
|
# https://github.com/sysstat/sysstat/commit/6f8dc568e6ab072bb8205b732f04e685bf9237c0
|
||||||
|
Patch11: CVE-2023-33204.patch
|
||||||
|
|
||||||
BuildRequires: gettext, lm_sensors-devel, systemd
|
BuildRequires: gettext, lm_sensors-devel, systemd
|
||||||
|
|
||||||
@ -50,6 +60,12 @@ The cifsiostat command reports I/O statistics for CIFS file systems.
|
|||||||
%patch03 -p1
|
%patch03 -p1
|
||||||
%patch04 -p1
|
%patch04 -p1
|
||||||
%patch05 -p1
|
%patch05 -p1
|
||||||
|
%patch06 -p1
|
||||||
|
%patch07 -p1
|
||||||
|
%patch08 -p1
|
||||||
|
%patch09 -p1
|
||||||
|
%patch10 -p1
|
||||||
|
%patch11 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export CFLAGS="$RPM_OPT_FLAGS -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld"
|
export CFLAGS="$RPM_OPT_FLAGS -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld"
|
||||||
@ -98,6 +114,25 @@ fi
|
|||||||
%{_localstatedir}/log/sa
|
%{_localstatedir}/log/sa
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue May 07 2024 Lukáš Zaoral <lzaoral@redhat.com> - 11.7.3-13
|
||||||
|
- fix memory allocation errors with malformed sa files (RHEL-35511)
|
||||||
|
- reorder patches to prevent errors during their application
|
||||||
|
|
||||||
|
* Wed Dec 13 2023 Lukáš Zaoral <lzaoral@redhat.com> - 11.7.3-12
|
||||||
|
- fix sar error when the directory /var/log/sa was removed (RHEL-19301)
|
||||||
|
|
||||||
|
* Fri Jul 07 2023 Pavel Šimovec <psimovec@redhat.com> - 11.7.3-11
|
||||||
|
- fix the arithmetic overflow in allocate_structures() that is still possible on some 32 bit systems (CVE-2023-33204)
|
||||||
|
|
||||||
|
* Thu Mar 16 2023 Lukáš Zaoral <lzaoral@redhat.com> - 11.7.3-10
|
||||||
|
- Fix incorrect CPU usage on ALL CPU field for iowait in mpstat (#2178863)
|
||||||
|
|
||||||
|
* Wed Dec 14 2022 Lukáš Zaoral <lzaoral@redhat.com> - 11.7.3-9
|
||||||
|
- add -f flag to force fdatasync() after sa file update (#2153192)
|
||||||
|
|
||||||
|
* Thu Nov 10 2022 Lukáš Zaoral <lzaoral@redhat.com> - 11.7.3-8
|
||||||
|
- arithmetic overflow in allocate_structures() on 32 bit systems (CVE-2022-39377)
|
||||||
|
|
||||||
* Mon Nov 29 2021 <msekleta@redhat.com> - 11.7.3-7
|
* Mon Nov 29 2021 <msekleta@redhat.com> - 11.7.3-7
|
||||||
- Don't trigger autofs mounts when running sadc (#2000910)
|
- Don't trigger autofs mounts when running sadc (#2000910)
|
||||||
- sar: Add missing %gnice CPU value for tickless CPU (#2000916)
|
- sar: Add missing %gnice CPU value for tickless CPU (#2000916)
|
||||||
|
Loading…
Reference in New Issue
Block a user