diff options
author | Ross Burton <ross.burton@intel.com> | 2019-12-08 20:35:47 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-12-16 23:11:10 +0000 |
commit | 593fe7e35267f665dbb37cc0abcc82be55ac67f8 (patch) | |
tree | 91bf149b019845a339354d9be48d4aed1b8b6c93 /meta/recipes-devtools/cve-check-tool/files/check-for-malloc_trim-before-using-it.patch | |
parent | 53acd121ab1097435812e3922bad7f8ff75f7107 (diff) | |
download | poky-593fe7e35267f665dbb37cc0abcc82be55ac67f8.tar.gz |
cve-check: backport rewrite from master
As detailed at [1] the XML feeds provided by NIST are being discontinued on
October 9th 2019. As cve-check-tool uses these feeds, cve-check.bbclass will be
inoperable after this date.
To ensure that cve-check continues working, backport the following commits from
master to move away from the unmaintained cve-check-tool to our own Python code
that fetches the JSON:
546d14135c5 cve-update-db: New recipe to update CVE database
bc144b028f6 cve-check: Remove dependency to cve-check-tool-native
7f62a20b32a cve-check: Manage CVE_PRODUCT with more than one name
3bf63bc6084 cve-check: Consider CVE that affects versions with less than operator
c0eabd30d7b cve-update-db: Use std library instead of urllib3
27eb839ee65 cve-check: be idiomatic
09be21f4d17 cve-update-db: Manage proxy if needed.
975793e3825 cve-update-db: do_populate_cve_db depends on do_fetch
0325dd72714 cve-update-db: Catch request.urlopen errors.
4078da92b49 cve-check: Depends on cve-update-db-native
f7676e9a38d cve-update-db: Use NVD CPE data to populate PRODUCTS table
bc0195be1b1 cve-check: Update unpatched CVE matching
c807c2a6409 cve-update-db-native: Skip recipe when cve-check class is not loaded.
07bb8b25e17 cve-check: remove redundant readline CVE whitelisting
5388ed6d137 cve-check-tool: remove
270ac00cb43 cve-check.bbclass: initialize to_append
e6bf9000987 cve-check: allow comparison of Vendor as well as Product
91770338f76 cve-update-db-native: use SQL placeholders instead of format strings
7069302a4cc cve-check: Replace CVE_CHECK_CVE_WHITELIST by CVE_CHECK_WHITELIST
78de2cb39d7 cve-update-db-native: Remove hash column from database.
4b301030cf9 cve-update-db-native: use os.path.join instead of +
f0d822fad2a cve-update-db: actually inherit native
b309840b6aa cve-update-db-native: use executemany() to optimise CPE insertion
bb4e53af33d cve-update-db-native: improve metadata parsing
94227459792 cve-update-db-native: clean up JSON fetching
95438d52b73 cve-update-db-native: fix https proxy issues
1f9a963b9ff glibc: exclude child recipes from CVE scanning
[1] https://nvd.nist.gov/General/News/XML-Vulnerability-Feed-Retirement
(From OE-Core rev: 8c87e78547c598cada1bce92e7b25d85b994e2eb)
(From OE-Core rev: beeed02f9831e75c3f773e44d7efc726f1ff859c)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/cve-check-tool/files/check-for-malloc_trim-before-using-it.patch')
-rw-r--r-- | meta/recipes-devtools/cve-check-tool/files/check-for-malloc_trim-before-using-it.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/meta/recipes-devtools/cve-check-tool/files/check-for-malloc_trim-before-using-it.patch b/meta/recipes-devtools/cve-check-tool/files/check-for-malloc_trim-before-using-it.patch deleted file mode 100644 index 0774ad946a..0000000000 --- a/meta/recipes-devtools/cve-check-tool/files/check-for-malloc_trim-before-using-it.patch +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | From ce64633b9733e962b8d8482244301f614d8b5845 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 22 Aug 2016 22:54:24 -0700 | ||
4 | Subject: [PATCH] Check for malloc_trim before using it | ||
5 | |||
6 | malloc_trim is gnu specific and not all libc | ||
7 | implement it, threfore write a configure check | ||
8 | to poke for it first and use the define to | ||
9 | guard its use. | ||
10 | |||
11 | Helps in compiling on musl based systems | ||
12 | |||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | Upstream-Status: Submitted [https://github.com/ikeydoherty/cve-check-tool/pull/48] | ||
16 | configure.ac | 2 ++ | ||
17 | src/core.c | 4 ++-- | ||
18 | 2 files changed, 4 insertions(+), 2 deletions(-) | ||
19 | |||
20 | diff --git a/configure.ac b/configure.ac | ||
21 | index d3b66ce..79c3542 100644 | ||
22 | --- a/configure.ac | ||
23 | +++ b/configure.ac | ||
24 | @@ -19,6 +19,8 @@ m4_define([json_required_version], [0.16.0]) | ||
25 | m4_define([openssl_required_version],[1.0.0]) | ||
26 | # TODO: Set minimum sqlite | ||
27 | |||
28 | +AC_CHECK_FUNCS_ONCE(malloc_trim) | ||
29 | + | ||
30 | PKG_CHECK_MODULES(CVE_CHECK_TOOL, | ||
31 | [ | ||
32 | glib-2.0 >= glib_required_version, | ||
33 | diff --git a/src/core.c b/src/core.c | ||
34 | index 6263031..0d5df29 100644 | ||
35 | --- a/src/core.c | ||
36 | +++ b/src/core.c | ||
37 | @@ -498,9 +498,9 @@ bool cve_db_load(CveDB *self, const char *fname) | ||
38 | } | ||
39 | |||
40 | b = true; | ||
41 | - | ||
42 | +#ifdef HAVE_MALLOC_TRIM | ||
43 | malloc_trim(0); | ||
44 | - | ||
45 | +#endif | ||
46 | xmlFreeTextReader(r); | ||
47 | if (fd) { | ||
48 | close(fd); | ||
49 | -- | ||
50 | 2.9.3 | ||
51 | |||