From: Michael Opdenacker Date: Thu, 5 Aug 2021 16:50:46 +0000 (+0200) Subject: cve-check: improve comment about CVE patch file names X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fea9f2edf515cca07e867213294d0e6dafbfbd74;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git cve-check: improve comment about CVE patch file names Signed-off-by: Michael Opdenacker Signed-off-by: Richard Purdie (cherry picked from commit 8aa613480663e11ecc62278d8c57ca719eb23899) Signed-off-by: Anuj Mittal --- diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index 246393338c1..4fa1a64f857 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -166,9 +166,12 @@ def get_patches_cves(d): pn = d.getVar("PN") cve_match = re.compile("CVE:( CVE\-\d{4}\-\d+)+") - # Matches last CVE-1234-211432 in the file name, also if written - # with small letters. Not supporting multiple CVE id's in a single - # file name. + # Matches the last "CVE-YYYY-ID" in the file name, also if written + # in lowercase. Possible to have multiple CVE IDs in a single + # file name, but only the last one will be detected from the file name. + # However, patch files contents addressing multiple CVE IDs are supported + # (cve_match regular expression) + cve_file_name_match = re.compile(".*([Cc][Vv][Ee]\-\d{4}\-\d+)") patched_cves = set()