From 33bee3d59f184d1becfa65691a05d69f29f663ff Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Fri, 17 Jan 2020 19:14:34 +0200 Subject: sysstat: fix CVE-2019-19725 (From OE-Core rev: 7f8f018ea5ef6ecb80c5b5250df90a8b690e6f47) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- .../sysstat/sysstat/CVE-2019-19725.patch | 28 ++++++++++++++++++++++ meta/recipes-extended/sysstat/sysstat_12.1.3.bb | 4 +++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/sysstat/sysstat/CVE-2019-19725.patch 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 @@ +From a5c8abd4a481ee6e27a3acf00e6d9b0f023e20ed Mon Sep 17 00:00:00 2001 +From: Sebastien GODARD +Date: Mon, 9 Dec 2019 17:54:07 +0100 +Subject: [PATCH] Fix #242: Double free in check_file_actlst() + +Avoid freeing buffer() twice. + +Signed-off-by: Sebastien GODARD + +Upstream-Status: Backport [https://github.com/sysstat/sysstat/commit/a5c8abd4a481ee6e27a3acf00e6d9b0f023e20ed] +CVE: CVE-2019-19725 +Signed-off-by: Anuj Mittal +--- + sa_common.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/sa_common.c b/sa_common.c +index cf52aefe..856a3715 100644 +--- a/sa_common.c ++++ b/sa_common.c +@@ -2153,6 +2153,7 @@ void check_file_actlst(int *ifd, char *dfile, struct activity *act[], uint64_t f + } + + free(buffer); ++ buffer = NULL; + + /* Check that at least one activity selected by the user is available in file */ + 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 5daf3f45f5..1b552166b0 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 LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb" -SRC_URI += "file://0001-Include-needed-headers-explicitly.patch" +SRC_URI += "file://0001-Include-needed-headers-explicitly.patch \ + file://CVE-2019-19725.patch \ +" SRC_URI[md5sum] = "0f9b73f60aba6fd49de346bc384902c3" SRC_URI[sha256sum] = "55498bf82755ba9fed3e7df61fd26f8f50dd3e7b3b229c731029a4c8ab51a1aa" -- cgit v1.2.3-54-g00ecf