Compare commits
No commits in common. 'c9' and 'i8c' have entirely different histories.
@ -1 +1 @@
|
||||
SOURCES/v12.5.4.tar.gz
|
||||
SOURCES/sysstat-11.7.3.tar.xz
|
||||
|
||||
@ -1 +1 @@
|
||||
597196f8f2be7a8960bec880c18eec875b27ff73 SOURCES/v12.5.4.tar.gz
|
||||
d60fe0d4789cb377105c9a30f73e8e2158d3d288 SOURCES/sysstat-11.7.3.tar.xz
|
||||
|
||||
@ -0,0 +1,88 @@
|
||||
From 5b5339d06c4f50730e5cc679e0854ce716f39117 Mon Sep 17 00:00:00 2001
|
||||
From: Ondrej Dubaj <odubaj@redhat.com>
|
||||
Date: Thu, 28 Feb 2019 15:29:08 +0100
|
||||
Subject: [PATCH] ignoring autofs as real filesystem by counting number of
|
||||
valid filesystems and getting all valid filesystems
|
||||
|
||||
---
|
||||
count.c | 18 ++++++++++++++++--
|
||||
rd_stats.c | 18 ++++++++++++++++--
|
||||
2 files changed, 32 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/count.c b/count.c
|
||||
index 03469b0..6424baa 100644
|
||||
--- a/count.c
|
||||
+++ b/count.c
|
||||
@@ -463,8 +463,8 @@ __nr_t get_usb_nr(void)
|
||||
__nr_t get_filesystem_nr(void)
|
||||
{
|
||||
FILE *fp;
|
||||
- char line[512], fs_name[MAX_FS_LEN], mountp[256];
|
||||
- char *pos = 0;
|
||||
+ char line[512], fs_name[MAX_FS_LEN], mountp[256], type[128];
|
||||
+ char *pos = 0, *pos2 = 0;
|
||||
__nr_t fs = 0;
|
||||
int skip = 0, skip_next = 0;
|
||||
struct statvfs buf;
|
||||
@@ -491,6 +491,20 @@ __nr_t get_filesystem_nr(void)
|
||||
if (pos == NULL)
|
||||
continue;
|
||||
|
||||
+ /*
|
||||
+ * Find second field separator position,
|
||||
+ * read filesystem type,
|
||||
+ * if filesystem type is autofs, skip it
|
||||
+ */
|
||||
+ memset(type, 0, sizeof(type));
|
||||
+ pos2 = strchr(pos + 1, ' ');
|
||||
+ if (pos2 == NULL)
|
||||
+ continue;
|
||||
+
|
||||
+ sscanf(pos2 + 1, "%127s", type);
|
||||
+ if(strcmp(type, "autofs") == 0)
|
||||
+ continue;
|
||||
+
|
||||
/* Read filesystem name and mount point */
|
||||
sscanf(line, "%127s", fs_name);
|
||||
sscanf(pos + 1, "%255s", mountp);
|
||||
diff --git a/rd_stats.c b/rd_stats.c
|
||||
index 61dc958..43e082c 100644
|
||||
--- a/rd_stats.c
|
||||
+++ b/rd_stats.c
|
||||
@@ -2464,10 +2464,10 @@ __nr_t read_bus_usb_dev(struct stats_pwr_usb *st_pwr_usb, __nr_t nr_alloc)
|
||||
__nr_t read_filesystem(struct stats_filesystem *st_filesystem, __nr_t nr_alloc)
|
||||
{
|
||||
FILE *fp;
|
||||
- char line[512], fs_name[128], mountp[256];
|
||||
+ char line[512], fs_name[128], mountp[256], type[128];
|
||||
int skip = 0, skip_next = 0;
|
||||
char *pos = 0;
|
||||
- __nr_t fs_read = 0;
|
||||
+ __nr_t fs_read = 0, *pos2 = 0;
|
||||
struct stats_filesystem *st_filesystem_i;
|
||||
struct statvfs buf;
|
||||
|
||||
@@ -2491,6 +2491,20 @@ __nr_t read_filesystem(struct stats_filesystem *st_filesystem, __nr_t nr_alloc)
|
||||
if (pos == NULL)
|
||||
continue;
|
||||
|
||||
+ /*
|
||||
+ * Find second field separator position,
|
||||
+ * read filesystem type,
|
||||
+ * if filesystem type is autofs, skip it
|
||||
+ */
|
||||
+ memset(type, 0, sizeof(type));
|
||||
+ pos2 = strchr(pos + 1, ' ');
|
||||
+ if (pos2 == NULL)
|
||||
+ continue;
|
||||
+
|
||||
+ sscanf(pos2 + 1, "%127s", type);
|
||||
+ if(strcmp(type, "autofs") == 0)
|
||||
+ continue;
|
||||
+
|
||||
/* Read current filesystem name */
|
||||
sscanf(line, "%127s", fs_name);
|
||||
/*
|
||||
--
|
||||
2.30.1 (Apple Git-130)
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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,40 @@
|
||||
From ce90f916fee2a39eb914f8b6b349adb76d100f75 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastien GODARD <sysstat@users.noreply.github.com>
|
||||
Date: Sat, 13 Apr 2019 18:44:29 +0200
|
||||
Subject: [PATCH] sadf: Fix seg fault on empty data files
|
||||
|
||||
Trying to display XML or JSON data (with sadf -x/-j) from a data file
|
||||
containing only RESTART records created a core dump.
|
||||
This patch fixes that.
|
||||
|
||||
Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
|
||||
---
|
||||
sadf.c | 7 ++++---
|
||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/sadf.c b/sadf.c
|
||||
index 2d2c39c..5d558d3 100644
|
||||
--- a/sadf.c
|
||||
+++ b/sadf.c
|
||||
@@ -963,14 +963,15 @@ void logic1_display_loop(int ifd, struct file_activity *file_actlst, char *file,
|
||||
(tm_start.use && (datecmp(loctime, &tm_start) < 0)) ||
|
||||
(tm_end.use && (datecmp(loctime, &tm_end) >= 0))));
|
||||
|
||||
- /* Save the first stats collected. Used for example in next_slice() function */
|
||||
- copy_structures(act, id_seq, record_hdr, 2, 0);
|
||||
-
|
||||
curr = 1;
|
||||
cnt = count;
|
||||
reset = TRUE;
|
||||
|
||||
if (!eosaf) {
|
||||
+
|
||||
+ /* Save the first stats collected. Used for example in next_slice() function */
|
||||
+ copy_structures(act, id_seq, record_hdr, 2, 0);
|
||||
+
|
||||
do {
|
||||
eosaf = read_next_sample(ifd, IGNORE_COMMENT | IGNORE_RESTART, curr,
|
||||
file, &rtype, tab, file_magic, file_actlst,
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -0,0 +1,31 @@
|
||||
From c542c259ba9e71a5ade235dfbcde67ac8b510c4f Mon Sep 17 00:00:00 2001
|
||||
From: Sebastien GODARD <sysstat@users.noreply.github.com>
|
||||
Date: Fri, 19 Apr 2019 15:20:45 +0200
|
||||
Subject: [PATCH] sar: Add missing %gnice CPU value for tickless CPU
|
||||
|
||||
A field (which should be displayed as 0.00) was missing in CPU
|
||||
statistics displayed by "sar -u ALL" for tickless CPUs.
|
||||
|
||||
Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
|
||||
---
|
||||
pr_stats.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/pr_stats.c b/pr_stats.c
|
||||
index 4fbd5d1..319630d 100644
|
||||
--- a/pr_stats.c
|
||||
+++ b/pr_stats.c
|
||||
@@ -218,8 +218,8 @@ __print_funct_t print_cpu_stats(struct activity *a, int prev, int curr,
|
||||
* %irq, %soft, %guest, %gnice.
|
||||
*/
|
||||
else if (DISPLAY_CPU_ALL(a->opt_flags)) {
|
||||
- cprintf_pc(DISPLAY_UNIT(flags), 4, 9, 2,
|
||||
- 0.0, 0.0, 0.0, 100.0);
|
||||
+ cprintf_pc(DISPLAY_UNIT(flags), 5, 9, 2,
|
||||
+ 0.0, 0.0, 0.0, 0.0, 100.0);
|
||||
printf("\n");
|
||||
}
|
||||
continue;
|
||||
--
|
||||
2.30.1 (Apple Git-130)
|
||||
|
||||
@ -0,0 +1,26 @@
|
||||
From 83dac62520afe3fa92b53393f438c9fb9c492525 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastien GODARD <sysstat@users.noreply.github.com>
|
||||
Date: Sat, 6 Oct 2018 18:12:54 +0200
|
||||
Subject: [PATCH] sar: Fix typo in manual page
|
||||
|
||||
Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
|
||||
---
|
||||
man/sar.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/man/sar.in b/man/sar.in
|
||||
index c45ee54..925c5f5 100644
|
||||
--- a/man/sar.in
|
||||
+++ b/man/sar.in
|
||||
@@ -373,7 +373,7 @@ The following values are displayed:
|
||||
.B MBfsfree
|
||||
.RS
|
||||
.RS
|
||||
-Total amount a free space in megabytes (including space available only to privileged user).
|
||||
+Total amount of free space in megabytes (including space available only to privileged user).
|
||||
.RE
|
||||
|
||||
.B MBfsused
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -0,0 +1,43 @@
|
||||
--- sa_common.c
|
||||
+++ sa_common.c
|
||||
@@ -1249,6 +1249,11 @@
|
||||
/* Remap [unsigned] long fields */
|
||||
d = gtypes_nr[0] - ftypes_nr[0];
|
||||
if (d) {
|
||||
+
|
||||
+ if (ftypes_nr[0] * ULL_ALIGNMENT_WIDTH < ftypes_nr[0])
|
||||
+ /* Overflow */
|
||||
+ return;
|
||||
+
|
||||
memmove(((char *) ps) + gtypes_nr[0] * ULL_ALIGNMENT_WIDTH,
|
||||
((char *) ps) + ftypes_nr[0] * ULL_ALIGNMENT_WIDTH,
|
||||
st_size - ftypes_nr[0] * ULL_ALIGNMENT_WIDTH);
|
||||
@@ -1260,7 +1265,13 @@
|
||||
/* Remap [unsigned] int fields */
|
||||
d = gtypes_nr[1] - ftypes_nr[1];
|
||||
if (d) {
|
||||
- memmove(((char *) ps) + gtypes_nr[0] * ULL_ALIGNMENT_WIDTH
|
||||
+
|
||||
+ if (gtypes_nr[0] * ULL_ALIGNMENT_WIDTH +
|
||||
+ ftypes_nr[1] * UL_ALIGNMENT_WIDTH < ftypes_nr[1])
|
||||
+ /* Overflow */
|
||||
+ return;
|
||||
+
|
||||
+ memmove(((char *) ps) + gtypes_nr[0] * ULL_ALIGNMENT_WIDTH
|
||||
+ gtypes_nr[1] * UL_ALIGNMENT_WIDTH,
|
||||
((char *) ps) + gtypes_nr[0] * ULL_ALIGNMENT_WIDTH
|
||||
+ ftypes_nr[1] * UL_ALIGNMENT_WIDTH,
|
||||
@@ -1275,6 +1286,13 @@
|
||||
/* Remap possible fields (like strings of chars) following int fields */
|
||||
d = gtypes_nr[2] - ftypes_nr[2];
|
||||
if (d) {
|
||||
+
|
||||
+ if (gtypes_nr[0] * ULL_ALIGNMENT_WIDTH +
|
||||
+ gtypes_nr[1] * UL_ALIGNMENT_WIDTH +
|
||||
+ ftypes_nr[2] * U_ALIGNMENT_WIDTH < ftypes_nr[2])
|
||||
+ /* Overflow */
|
||||
+ return;
|
||||
+
|
||||
memmove(((char *) ps) + gtypes_nr[0] * ULL_ALIGNMENT_WIDTH
|
||||
+ gtypes_nr[1] * UL_ALIGNMENT_WIDTH
|
||||
+ gtypes_nr[2] * U_ALIGNMENT_WIDTH,
|
||||
@ -1,7 +1,9 @@
|
||||
From commit 6f8dc568e6ab072bb8205b732f04e685bf9237c0
|
||||
From: Sebastien GODARD <sysstat@users.noreply.github.com>
|
||||
Date: Wed, May 17 21:10:31 2023 +0200
|
||||
Subject: Merge branch 'pkopylov-master'
|
||||
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>
|
||||
|
||||
@ -1,112 +0,0 @@
|
||||
From 398585bfe7b1340d41143f50dfc868ef8ab9a5e4 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= <lzaoral@redhat.com>
|
||||
Date: Tue, 21 Feb 2023 12:43:42 +0100
|
||||
Subject: [PATCH] Tools that take --dec=X option should only accept digits
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Right now the argument of --dec is passed to atoi(3) which returns 0
|
||||
on conversion error. Therefore, --dec=A was not rejected and was
|
||||
equivalent to --dec=0 by mistake.
|
||||
|
||||
Signed-off-by: Lukáš Zaoral <lzaoral@redhat.com>
|
||||
---
|
||||
cifsiostat.c | 5 +++++
|
||||
iostat.c | 5 +++++
|
||||
mpstat.c | 5 +++++
|
||||
pidstat.c | 5 +++++
|
||||
sar.c | 6 ++++++
|
||||
5 files changed, 26 insertions(+)
|
||||
|
||||
diff --git a/cifsiostat.c b/cifsiostat.c
|
||||
index 375b1ff..849583b 100644
|
||||
--- a/cifsiostat.c
|
||||
+++ b/cifsiostat.c
|
||||
@@ -522,6 +522,11 @@ int main(int argc, char **argv)
|
||||
}
|
||||
|
||||
else if (!strncmp(argv[opt], "--dec=", 6) && (strlen(argv[opt]) == 7)) {
|
||||
+ /* Check that the argument is a digit */
|
||||
+ if (!isdigit(argv[opt][6])) {
|
||||
+ usage(argv[0]);
|
||||
+ }
|
||||
+
|
||||
/* Get number of decimal places */
|
||||
dplaces_nr = atoi(argv[opt] + 6);
|
||||
if ((dplaces_nr < 0) || (dplaces_nr > 2)) {
|
||||
diff --git a/iostat.c b/iostat.c
|
||||
index 1d7ea3c..7ac56ef 100644
|
||||
--- a/iostat.c
|
||||
+++ b/iostat.c
|
||||
@@ -2142,6 +2142,11 @@ int main(int argc, char **argv)
|
||||
#endif
|
||||
|
||||
else if (!strncmp(argv[opt], "--dec=", 6) && (strlen(argv[opt]) == 7)) {
|
||||
+ /* Check that the argument is a digit */
|
||||
+ if (!isdigit(argv[opt][6])) {
|
||||
+ usage(argv[0]);
|
||||
+ }
|
||||
+
|
||||
/* Get number of decimal places */
|
||||
dplaces_nr = atoi(argv[opt] + 6);
|
||||
if ((dplaces_nr < 0) || (dplaces_nr > 2)) {
|
||||
diff --git a/mpstat.c b/mpstat.c
|
||||
index 90d6226..5045e45 100644
|
||||
--- a/mpstat.c
|
||||
+++ b/mpstat.c
|
||||
@@ -2221,6 +2221,11 @@ int main(int argc, char **argv)
|
||||
while (++opt < argc) {
|
||||
|
||||
if (!strncmp(argv[opt], "--dec=", 6) && (strlen(argv[opt]) == 7)) {
|
||||
+ /* Check that the argument is a digit */
|
||||
+ if (!isdigit(argv[opt][6])) {
|
||||
+ usage(argv[0]);
|
||||
+ }
|
||||
+
|
||||
/* Get number of decimal places */
|
||||
dplaces_nr = atoi(argv[opt] + 6);
|
||||
if ((dplaces_nr < 0) || (dplaces_nr > 2)) {
|
||||
diff --git a/pidstat.c b/pidstat.c
|
||||
index 21fed6c..d550605 100644
|
||||
--- a/pidstat.c
|
||||
+++ b/pidstat.c
|
||||
@@ -2633,6 +2633,11 @@ int main(int argc, char **argv)
|
||||
}
|
||||
|
||||
else if (!strncmp(argv[opt], "--dec=", 6) && (strlen(argv[opt]) == 7)) {
|
||||
+ /* Check that the argument is a digit */
|
||||
+ if (!isdigit(argv[opt][6])) {
|
||||
+ usage(argv[0]);
|
||||
+ }
|
||||
+
|
||||
/* Get number of decimal places */
|
||||
dplaces_nr = atoi(argv[opt] + 6);
|
||||
if ((dplaces_nr < 0) || (dplaces_nr > 2)) {
|
||||
diff --git a/sar.c b/sar.c
|
||||
index 4f06172..7691793 100644
|
||||
--- a/sar.c
|
||||
+++ b/sar.c
|
||||
@@ -28,6 +28,7 @@
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <sys/stat.h>
|
||||
+#include <ctype.h>
|
||||
|
||||
#include "version.h"
|
||||
#include "sa.h"
|
||||
@@ -1372,6 +1373,11 @@ int main(int argc, char **argv)
|
||||
}
|
||||
|
||||
else if (!strncmp(argv[opt], "--dec=", 6) && (strlen(argv[opt]) == 7)) {
|
||||
+ /* Check that the argument is a digit */
|
||||
+ if (!isdigit(argv[opt][6])) {
|
||||
+ usage(argv[0]);
|
||||
+ }
|
||||
+
|
||||
/* Get number of decimal places */
|
||||
dplaces_nr = atoi(argv[opt] + 6);
|
||||
if ((dplaces_nr < 0) || (dplaces_nr > 2)) {
|
||||
--
|
||||
2.39.2
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
From 370ad59826c2320288a1999ef9038e2a2655b8a0 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastien GODARD <sysstat@users.noreply.github.com>
|
||||
Date: Thu, 22 Jun 2023 17:47:59 +0200
|
||||
Subject: [PATCH] Add UMASK definition to sysstat(5) manual page (#362)
|
||||
|
||||
Explain UMASK variable in sysstat(5) manual page.
|
||||
|
||||
Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
|
||||
Cherry-picked-by: Lukáš Zaoral <lzaoral@redhat.com>
|
||||
Upstream-commit: 370ad59826c2320288a1999ef9038e2a2655b8a0
|
||||
---
|
||||
man/sysstat.in | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/man/sysstat.in b/man/sysstat.in
|
||||
index 6ce6b473..89bdd3f4 100644
|
||||
--- a/man/sysstat.in
|
||||
+++ b/man/sysstat.in
|
||||
@@ -140,6 +140,15 @@ daily data files.
|
||||
These options are used only when a new data file is created. They will be
|
||||
ignored with an already existing one.
|
||||
.TP
|
||||
+.B UMASK
|
||||
+.RB "The " "sa1" " and " "sa2"
|
||||
+scripts generate system activity data and report files in the
|
||||
+.IR /var/log/sa
|
||||
+directory. By default the files are created with umask 0022
|
||||
+and are therefore readable for all users. Change this variable to restrict
|
||||
+the permissions on the files (e.g. use 0027 to adhere to more strict
|
||||
+security standards).
|
||||
+.TP
|
||||
.B YESTERDAY
|
||||
.RB "By default " "sa2"
|
||||
script generates yesterday's summary, since the
|
||||
Loading…
Reference in new issue