diff mbox series

[thud-next,02/11] cve-check: ensure all known CVEs are in the report

Message ID 20191208183557.32589-2-niko.mauno@iki.fi
State New
Headers show
Series [thud-next,01/11] cve-check: backport rewrite from master | expand

Commit Message

Niko Mauno Dec. 8, 2019, 6:35 p.m. UTC
From: Ross Burton <ross.burton@intel.com>

CVEs that are whitelisted or were not vulnerable when there are version
comparisons were not included in the report, so alter the logic to ensure that
all relevant CVEs are in the report for completeness.

(From OE-Core rev: 98256ff05fcfe9d5ccad360582c36eafb577c264)

Signed-off-by: Ross Burton <ross.burton@intel.com>

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

 meta/classes/cve-check.bbclass | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)


Openembedded-core mailing list
diff mbox series


diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass
index c00d2910be..f87bcc9dc6 100644
--- a/meta/classes/cve-check.bbclass
+++ b/meta/classes/cve-check.bbclass
@@ -208,12 +208,14 @@  def check_cves(d, patched_cves):
             if cve in cve_whitelist:
                 bb.note("%s-%s has been whitelisted for %s" % (product, pv, cve))
+                # TODO: this should be in the report as 'whitelisted'
+                patched_cves.add(cve)
             elif cve in patched_cves:
                 bb.note("%s has been patched" % (cve))
                 to_append = False
                 if (operator_start == '=' and pv == version_start):
-                    cves_unpatched.append(cve)
+                    to_append = True
                     if operator_start:
@@ -243,8 +245,11 @@  def check_cves(d, patched_cves):
                         to_append = to_append_start or to_append_end
                 if to_append:
+                    bb.note("%s-%s is vulnerable to %s" % (product, pv, cve))
-                bb.debug(2, "%s-%s is not patched for %s" % (product, pv, cve))
+                else:
+                    bb.note("%s-%s is not vulnerable to %s" % (product, pv, cve))
+                    patched_cves.add(cve)
     return (list(patched_cves), cves_unpatched)