Skip to contentSkip to conversation

lib: spdx30_tasks: Handle patched CVEs

PATCH In review Joshua Watt 3 participants 4 messages Mar 6, 2025 – Mar 11, 2025

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lib: spdx30_tasks: Handle patched CVEs

The code to iterate over patched CVEs (e.g. those patched by a .patch file in SRC_URI) was accidentally omitted when writing the SPDX 3 handling. Add it in now

[YOCTO #15789]

---
 meta/lib/oe/spdx30_tasks.py | 10 ++++++++++
 1 file changed, 10 insertions(+)
meta/lib/oe/spdx30_tasks.py +10 -0
index e3e5dbc7427..e20bb0c86f3 100644
@@ -498,6 +498,16 @@ def create_spdx(d):
     # Add CVEs
     cve_by_status = {}
     if include_vex != "none":
+        for cve in oe.cve_check.get_patched_cves(d):
+            spdx_cve = build_objset.new_cve_vuln(cve)
+            build_objset.set_element_alias(spdx_cve)
+
+            cve_by_status.setdefault("Patched", {})[cve] = (
+                spdx_cve,
+                "patched",
+                "",
+            )
+
         for cve in d.getVarFlags("CVE_STATUS") or {}:
             decoded_status = oe.cve_check.decode_cve_status(d, cve)
 
Signature · 1 line
2.47.1
#1 lore raw
Quoted 30 lines · Joshua Watt via lists.openembedded.org

The code to iterate over patched CVEs (e.g. those patched by a .patch file in SRC_URI) was accidentally omitted when writing the SPDX 3 handling. Add it in now

[YOCTO #15789]

---
 meta/lib/oe/spdx30_tasks.py | 10 ++++++++++

 1 file changed, 10 insertions(+)
meta/lib/oe/spdx30_tasks.py +0 -0
index e3e5dbc7427..e20bb0c86f3 100644
@@ -498,6 +498,16 @@ def create_spdx(d):
      # Add CVEs
      cve_by_status = {}

     if include_vex != "none":
+        for cve in oe.cve_check.get_patched_cves(d):
+            spdx_cve = build_objset.new_cve_vuln(cve) +            build_objset.set_element_alias(spdx_cve)

meta/lib/oe/spdx30_tasks.py +7 -0
+
+            cve_by_status.setdefault("Patched", {})[cve] = (
+                spdx_cve,
+                "patched",
+                "",
+            )
+
Quoted 3 lines

         for cve in d.getVarFlags("CVE_STATUS") or {}:
             decoded_status = oe.cve_check.decode_cve_status(d, cve)

I worry this has increased the build time by around 10 mins (~25%):

https://valkyrie.yocto.io/pub/non-release/20250311-54/testresults/buildperf-alma8/perf-alma8-vk_master_20250311090119_046a92d351.html

Cheers,

Richard

#2 lore raw
Quoted 39 lines · Richard Purdie
Quoted 23 lines · Joshua Watt via lists.openembedded.org

The code to iterate over patched CVEs (e.g. those patched by a .patch file in SRC_URI) was accidentally omitted when writing the SPDX 3 handling. Add it in now

[YOCTO #15789]

---
 meta/lib/oe/spdx30_tasks.py | 10 ++++++++++
 1 file changed, 10 insertions(+)
meta/lib/oe/spdx30_tasks.py +3 -0
index e3e5dbc7427..e20bb0c86f3 100644
@@ -498,6 +498,16 @@ def create_spdx(d):
     # Add CVEs
     cve_by_status = {}
     if include_vex != "none":
+        for cve in oe.cve_check.get_patched_cves(d):
+            spdx_cve = build_objset.new_cve_vuln(cve)
+            build_objset.set_element_alias(spdx_cve)

meta/lib/oe/spdx30_tasks.py def create_spdx(d): · line 513

Quoted 10 lines
meta/lib/oe/spdx30_tasks.py +7 -0
+
+            cve_by_status.setdefault("Patched", {})[cve] = (
+                spdx_cve,
+                "patched",
+                "",
+            )
+
         for cve in d.getVarFlags("CVE_STATUS") or {}:
             decoded_status = oe.cve_check.decode_cve_status(d, cve)
 

I worry this has increased the build time by around 10 mins (~25%):

Quoted 1 line

https://valkyrie.yocto.io/pub/non-release/20250311-54/testresults/buildperf-alma8/perf-alma8-vk_master_20250311090119_046a92d351.html

Ok. Let me see what I can do about that

Quoted 8 lines

Cheers,

Richard

#3 lore raw

Hi,

Quoted 42 lines · Joshua Watt via lists.openembedded.org
Quoted 39 lines · Richard Purdie
Quoted 23 lines · Joshua Watt via lists.openembedded.org

The code to iterate over patched CVEs (e.g. those patched by a .patch file in SRC_URI) was accidentally omitted when writing the SPDX 3 handling. Add it in now

[YOCTO #15789]

---
 meta/lib/oe/spdx30_tasks.py | 10 ++++++++++
 1 file changed, 10 insertions(+)
meta/lib/oe/spdx30_tasks.py +3 -0
index e3e5dbc7427..e20bb0c86f3 100644
@@ -498,6 +498,16 @@ def create_spdx(d):
     # Add CVEs
     cve_by_status = {}
     if include_vex != "none":
+        for cve in oe.cve_check.get_patched_cves(d):
+            spdx_cve = build_objset.new_cve_vuln(cve)
+            build_objset.set_element_alias(spdx_cve)

meta/lib/oe/spdx30_tasks.py def create_spdx(d): · line 513

Quoted 10 lines
meta/lib/oe/spdx30_tasks.py +7 -0
+
+            cve_by_status.setdefault("Patched", {})[cve] = (
+                spdx_cve,
+                "patched",
+                "",
+            )
+
         for cve in d.getVarFlags("CVE_STATUS") or {}:
             decoded_status = oe.cve_check.decode_cve_status(d, cve)
 

I worry this has increased the build time by around 10 mins (~25%):

Quoted 4 lines
Quoted 1 line

https://valkyrie.yocto.io/pub/non-release/20250311-54/testresults/buildperf-alma8/perf-alma8-vk_master_20250311090119_046a92d351.html

Ok. Let me see what I can do about that

Yes please. I think the kernel build time increase from ~4 minutes to ~16 minutes is what I saw in my local builds. Both kernel and image builds are affected by these SDPX CVE data changes, as we discussed yesterday on #yocto irc.

Cheers,

-Mikko