sysstat: 12.2.0 -> 12.2.1

0001-Include-needed-headers-explicitly.patch and CVE-2019-19725.patch
Removed since they are included in 12.2.1

(From OE-Core rev: 1e6f6d0937f136afb629c9c02036b9ba797f96a7)

Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Wang Mingyu
2020-01-03 05:01:18 -08:00
committed by Richard Purdie
parent 45eca18948
commit 4559a048c4
4 changed files with 8 additions and 98 deletions

View File

@@ -1,59 +0,0 @@
From 42325faa88d64cce799977d611b2792beb154643 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 14 Sep 2015 08:36:59 +0000
Subject: [PATCH] Include needed headers explicitly
on glibc these headers get pulled in indirectly via other .h files
but right fix is to include them directly when used
fixes
error: use of undeclared identifier 'PATH_MAX'
error: called object type 'unsigned int' is not a function or function pointer
dm_major = major(aux.st_rdev);
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
common.c | 1 +
ioconf.c | 1 +
sa_common.c | 1 +
3 files changed, 3 insertions(+)
Index: sysstat-11.7.1/common.c
===================================================================
--- sysstat-11.7.1.orig/common.c
+++ sysstat-11.7.1/common.c
@@ -20,6 +20,7 @@
*/
#include <stdio.h>
+#include <limits.h>
#include <string.h>
#include <stdlib.h>
#include <stdarg.h>
Index: sysstat-11.7.1/ioconf.c
===================================================================
--- sysstat-11.7.1.orig/ioconf.c
+++ sysstat-11.7.1/ioconf.c
@@ -27,6 +27,7 @@
#include <errno.h>
#include <dirent.h>
#include <sys/stat.h>
+#include <sys/types.h>
#include "ioconf.h"
#include "common.h"
Index: sysstat-11.7.1/sa_common.c
===================================================================
--- sysstat-11.7.1.orig/sa_common.c
+++ sysstat-11.7.1/sa_common.c
@@ -20,6 +20,7 @@
*/
#include <stdio.h>
+#include <limits.h>
#include <string.h>
#include <stdlib.h>
#include <stdint.h>

View File

@@ -1,28 +0,0 @@
From a5c8abd4a481ee6e27a3acf00e6d9b0f023e20ed Mon Sep 17 00:00:00 2001
From: Sebastien GODARD <sysstat@users.noreply.github.com>
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 <sysstat@users.noreply.github.com>
Upstream-Status: Backport [https://github.com/sysstat/sysstat/commit/a5c8abd4a481ee6e27a3acf00e6d9b0f023e20ed]
CVE: CVE-2019-19725
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
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++) {

View File

@@ -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-configure.in-remove-check-for-chkconfig.patch \
file://CVE-2019-19725.patch \
"
SRC_URI[md5sum] = "7deffb18e7f32a0b74ab81f1f75de9ee"
SRC_URI[sha256sum] = "61aa98eb8b38542eb97defcc2472adee1a24df8252f41b96e20d64c6064a8375"

View File

@@ -0,0 +1,8 @@
require sysstat.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb"
SRC_URI += "file://0001-configure.in-remove-check-for-chkconfig.patch"
SRC_URI[md5sum] = "9dfff5fac24e35bd92fb7896debf2ffb"
SRC_URI[sha256sum] = "8edb0e19b514ac560a098a02933a4735b881296d61014db89bf80f05dd7a4732"