summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2020-01-17 17:14:34 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-28 11:15:01 (GMT)
commit33bee3d59f184d1becfa65691a05d69f29f663ff (patch)
tree683bab667655ec90933f5ba27d387b09de31e7be
parentee756983714fd0657ceaac77ddae05578db2c36a (diff)
downloadpoky-33bee3d59f184d1becfa65691a05d69f29f663ff.tar.gz
sysstat: fix CVE-2019-19725
(From OE-Core rev: 7f8f018ea5ef6ecb80c5b5250df90a8b690e6f47) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/sysstat/sysstat/CVE-2019-19725.patch28
-rw-r--r--meta/recipes-extended/sysstat/sysstat_12.1.3.bb4
2 files changed, 31 insertions, 1 deletions
diff --git a/meta/recipes-extended/sysstat/sysstat/CVE-2019-19725.patch b/meta/recipes-extended/sysstat/sysstat/CVE-2019-19725.patch
new file mode 100644
index 0000000..2aa1272
--- /dev/null
+++ b/meta/recipes-extended/sysstat/sysstat/CVE-2019-19725.patch
@@ -0,0 +1,28 @@
1From a5c8abd4a481ee6e27a3acf00e6d9b0f023e20ed Mon Sep 17 00:00:00 2001
2From: Sebastien GODARD <sysstat@users.noreply.github.com>
3Date: Mon, 9 Dec 2019 17:54:07 +0100
4Subject: [PATCH] Fix #242: Double free in check_file_actlst()
5
6Avoid freeing buffer() twice.
7
8Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
9
10Upstream-Status: Backport [https://github.com/sysstat/sysstat/commit/a5c8abd4a481ee6e27a3acf00e6d9b0f023e20ed]
11CVE: CVE-2019-19725
12Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
13---
14 sa_common.c | 1 +
15 1 file changed, 1 insertion(+)
16
17diff --git a/sa_common.c b/sa_common.c
18index cf52aefe..856a3715 100644
19--- a/sa_common.c
20+++ b/sa_common.c
21@@ -2153,6 +2153,7 @@ void check_file_actlst(int *ifd, char *dfile, struct activity *act[], uint64_t f
22 }
23
24 free(buffer);
25+ buffer = NULL;
26
27 /* Check that at least one activity selected by the user is available in file */
28 for (i = 0; i < NR_ACT; i++) {
diff --git a/meta/recipes-extended/sysstat/sysstat_12.1.3.bb b/meta/recipes-extended/sysstat/sysstat_12.1.3.bb
index 5daf3f4..1b55216 100644
--- a/meta/recipes-extended/sysstat/sysstat_12.1.3.bb
+++ b/meta/recipes-extended/sysstat/sysstat_12.1.3.bb
@@ -2,7 +2,9 @@ require sysstat.inc
2 2
3LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb" 3LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb"
4 4
5SRC_URI += "file://0001-Include-needed-headers-explicitly.patch" 5SRC_URI += "file://0001-Include-needed-headers-explicitly.patch \
6 file://CVE-2019-19725.patch \
7"
6 8
7SRC_URI[md5sum] = "0f9b73f60aba6fd49de346bc384902c3" 9SRC_URI[md5sum] = "0f9b73f60aba6fd49de346bc384902c3"
8SRC_URI[sha256sum] = "55498bf82755ba9fed3e7df61fd26f8f50dd3e7b3b229c731029a4c8ab51a1aa" 10SRC_URI[sha256sum] = "55498bf82755ba9fed3e7df61fd26f8f50dd3e7b3b229c731029a4c8ab51a1aa"