]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
cve_check: skip remote patches that haven't been fetched when searching for CVE tags
authorRoss Burton <ross.burton@arm.com>
Wed, 27 Apr 2022 11:43:39 +0000 (12:43 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 28 Apr 2022 10:44:50 +0000 (11:44 +0100)
If a remote patch is compressed we need to have run the unpack task for
the file to exist locally.  Currently cve_check only depends on fetch so
instead of erroring out, emit a warning that this file won't be scanned
for CVE references.

Typically, remote compressed patches won't contain our custom tags, so
this is unlikely to be an issue.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oe/cve_check.py

index e445b7a6ae2b7eec320db3d24386fce6d06a580b..dc7d2e2826dedcf701f733920a98774f32937464 100644 (file)
@@ -89,9 +89,10 @@ def get_patched_cves(d):
     for url in oe.patch.src_patches(d):
         patch_file = bb.fetch.decodeurl(url)[2]
 
+        # Remote compressed patches may not be unpacked, so silently ignore them
         if not os.path.isfile(patch_file):
-            bb.error("File Not found: %s" % patch_file)
-            raise FileNotFoundError
+            bb.warn("%s does not exist, cannot extract CVE list" % patch_file)
+            continue
 
         # Check patch file name for CVE ID
         fname_match = cve_file_name_match.search(patch_file)