summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-12-05 16:43:51 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-09 11:56:41 +0000
commitb08bc19da3f452a386bd3c2bf63a1f0f23925fa7 (patch)
tree9a8bfcb0e37a1d4f1eaf470587145be3ea0c8217
parent2537fcf3143153e272630c42fc1d7ce85b463590 (diff)
downloadopenembedded-core-contrib-b08bc19da3f452a386bd3c2bf63a1f0f23925fa7.tar.gz
openembedded-core-contrib-b08bc19da3f452a386bd3c2bf63a1f0f23925fa7.tar.bz2
openembedded-core-contrib-b08bc19da3f452a386bd3c2bf63a1f0f23925fa7.zip
sysstat: update to 12.2.0
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/sysstat/sysstat/0001-Fix-232-Memory-corruption-bug-due-to-Integer-Overflo.patch46
-rw-r--r--meta/recipes-extended/sysstat/sysstat_12.1.6.bb11
-rw-r--r--meta/recipes-extended/sysstat/sysstat_12.2.0.bb10
3 files changed, 10 insertions, 57 deletions
diff --git a/meta/recipes-extended/sysstat/sysstat/0001-Fix-232-Memory-corruption-bug-due-to-Integer-Overflo.patch b/meta/recipes-extended/sysstat/sysstat/0001-Fix-232-Memory-corruption-bug-due-to-Integer-Overflo.patch
deleted file mode 100644
index 46b111806c..0000000000
--- a/meta/recipes-extended/sysstat/sysstat/0001-Fix-232-Memory-corruption-bug-due-to-Integer-Overflo.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 603ae4ed8cd65abf0776ef7f68354a5c24a3411c Mon Sep 17 00:00:00 2001
-From: Sebastien GODARD <sysstat@users.noreply.github.com>
-Date: Tue, 15 Oct 2019 14:39:33 +0800
-Subject: [PATCH] Fix #232: Memory corruption bug due to Integer Overflow in
- remap_struct()
-
-Try to avoid integer overflow when reading a corrupted binary datafile
-with sadf.
-
-Upstream-Status: Backport [https://github.com/sysstat/sysstat/commit/83fad9c895d1ac13f76af5883b7451b3302beef5]
-CVE: CVE-2019-16167
-
-Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
-Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com>
----
- sa_common.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/sa_common.c b/sa_common.c
-index 395c11c..cfa9007 100644
---- a/sa_common.c
-+++ b/sa_common.c
-@@ -1336,7 +1336,8 @@ int remap_struct(unsigned int gtypes_nr[], unsigned int ftypes_nr[],
- /* Remap [unsigned] int fields */
- d = gtypes_nr[1] - ftypes_nr[1];
- if (d) {
-- if (ftypes_nr[1] * UL_ALIGNMENT_WIDTH < ftypes_nr[1])
-+ if (gtypes_nr[0] * ULL_ALIGNMENT_WIDTH +
-+ ftypes_nr[1] * UL_ALIGNMENT_WIDTH < ftypes_nr[1])
- /* Overflow */
- return -1;
-
-@@ -1365,7 +1366,9 @@ int remap_struct(unsigned int gtypes_nr[], unsigned int ftypes_nr[],
- /* Remap possible fields (like strings of chars) following int fields */
- d = gtypes_nr[2] - ftypes_nr[2];
- if (d) {
-- if (ftypes_nr[2] * U_ALIGNMENT_WIDTH < ftypes_nr[2])
-+ if (gtypes_nr[0] * ULL_ALIGNMENT_WIDTH +
-+ gtypes_nr[1] * UL_ALIGNMENT_WIDTH +
-+ ftypes_nr[2] * U_ALIGNMENT_WIDTH < ftypes_nr[2])
- /* Overflow */
- return -1;
-
---
-1.9.1
-
diff --git a/meta/recipes-extended/sysstat/sysstat_12.1.6.bb b/meta/recipes-extended/sysstat/sysstat_12.1.6.bb
deleted file mode 100644
index 83bb45ea25..0000000000
--- a/meta/recipes-extended/sysstat/sysstat_12.1.6.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require sysstat.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb"
-
-SRC_URI += "file://0001-Include-needed-headers-explicitly.patch \
- file://0001-Fix-232-Memory-corruption-bug-due-to-Integer-Overflo.patch \
- file://0001-configure.in-remove-check-for-chkconfig.patch \
-"
-
-SRC_URI[md5sum] = "d8e3bbb9c873dd370f6d33664e326570"
-SRC_URI[sha256sum] = "f752f3c406153a6fc446496f1102872505ace3f0931d975c1d664c81ec09f129"
diff --git a/meta/recipes-extended/sysstat/sysstat_12.2.0.bb b/meta/recipes-extended/sysstat/sysstat_12.2.0.bb
new file mode 100644
index 0000000000..e3ae3dd51c
--- /dev/null
+++ b/meta/recipes-extended/sysstat/sysstat_12.2.0.bb
@@ -0,0 +1,10 @@
+require sysstat.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb"
+
+SRC_URI += "file://0001-Include-needed-headers-explicitly.patch \
+ file://0001-configure.in-remove-check-for-chkconfig.patch \
+"
+
+SRC_URI[md5sum] = "7deffb18e7f32a0b74ab81f1f75de9ee"
+SRC_URI[sha256sum] = "61aa98eb8b38542eb97defcc2472adee1a24df8252f41b96e20d64c6064a8375"