Skip to contentSkip to conversation

cve_check: skip remote patches that haven't been fetched when searching for CVE tags

PATCH New Akash Hadke 1 participant 1 message Aug 3, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cve_check: skip remote patches that haven't been fetched when searching for CVE tags

From: Ross Burton <[email protected]>

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.

(From OE-Core rev: b52a508bd7693c40e6416db9c9076a8789499501)

(cherry picked from commit cefc8741438c91f74264da6b59dece2e31f9e5a5)
(cherry picked from commit 498bbee789f0b3b3a827e7b6914dfa9de764b1be)
---
 meta/lib/oe/cve_check.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
meta/lib/oe/cve_check.py +3 -2
index a4b831831b..30fdc3e3dd 100644
@@ -114,9 +114,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)
Signature · 1 line
2.17.1