summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/sysstat
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2019-12-12 07:10:42 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-16 23:25:49 +0000
commitfbd088b3c94f31f95d94f769371b7e09f7884a76 (patch)
treefb3bee8e8a0b4aa81ed6bbc4b526227e95ac0cbb /meta/recipes-extended/sysstat
parent969b9974c600071a42fd2311ad099d135abb8a3b (diff)
downloadpoky-fbd088b3c94f31f95d94f769371b7e09f7884a76.tar.gz
sysstat: fix CVE-2019-19725
(From OE-Core rev: 2bf6fdc460526feb0955b3b789e7be78f6e8ec4a) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/sysstat')
-rw-r--r--meta/recipes-extended/sysstat/sysstat/CVE-2019-19725.patch28
-rw-r--r--meta/recipes-extended/sysstat/sysstat_12.2.0.bb1
2 files changed, 29 insertions, 0 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 0000000000..2aa12724f8
--- /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.2.0.bb b/meta/recipes-extended/sysstat/sysstat_12.2.0.bb
index e3ae3dd51c..f7a1a35975 100644
--- a/meta/recipes-extended/sysstat/sysstat_12.2.0.bb
+++ b/meta/recipes-extended/sysstat/sysstat_12.2.0.bb
@@ -4,6 +4,7 @@ LIC_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://0001-configure.in-remove-check-for-chkconfig.patch \ 6 file://0001-configure.in-remove-check-for-chkconfig.patch \
7 file://CVE-2019-19725.patch \
7" 8"
8 9
9SRC_URI[md5sum] = "7deffb18e7f32a0b74ab81f1f75de9ee" 10SRC_URI[md5sum] = "7deffb18e7f32a0b74ab81f1f75de9ee"