summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xmeta/recipes-kernel/linux/generate-cve-exclusions.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-kernel/linux/generate-cve-exclusions.py b/meta/recipes-kernel/linux/generate-cve-exclusions.py
index ef47f39c1b..b52c75c18c 100755
--- a/meta/recipes-kernel/linux/generate-cve-exclusions.py
+++ b/meta/recipes-kernel/linux/generate-cve-exclusions.py
@@ -62,18 +62,18 @@ do_cve_check[prefuncs] += "check_kernel_cve_status_version"
62 continue 62 continue
63 63
64 affected = data["affected_versions"] 64 affected = data["affected_versions"]
65 first_affected, last_affected = re.search(r"(.+) to (.+)", affected).groups() 65 first_affected, fixed = re.search(r"(.+) to (.+)", affected).groups()
66 first_affected = parse_version(first_affected) 66 first_affected = parse_version(first_affected)
67 last_affected = parse_version(last_affected) 67 fixed = parse_version(fixed)
68 68
69 handled = False 69 handled = False
70 if not last_affected: 70 if not fixed:
71 print(f"# {cve} has no known resolution") 71 print(f"# {cve} has no known resolution")
72 elif first_affected and version < first_affected: 72 elif first_affected and version < first_affected:
73 print(f"# fixed-version: only affects {first_affected} onwards") 73 print(f"# fixed-version: only affects {first_affected} onwards")
74 handled = True 74 handled = True
75 elif last_affected < version: 75 elif fixed <= version:
76 print(f"# fixed-version: Fixed after version {last_affected}") 76 print(f"# fixed-version: Fixed from version {fixed}")
77 handled = True 77 handled = True
78 else: 78 else:
79 if cve in stream_data: 79 if cve in stream_data:
@@ -87,9 +87,9 @@ do_cve_check[prefuncs] += "check_kernel_cve_status_version"
87 # TODO print a note that the kernel needs bumping 87 # TODO print a note that the kernel needs bumping
88 print(f"# {cve} needs backporting (fixed from {backport_ver})") 88 print(f"# {cve} needs backporting (fixed from {backport_ver})")
89 else: 89 else:
90 print(f"# {cve} needs backporting (fixed from {last_affected})") 90 print(f"# {cve} needs backporting (fixed from {fixed})")
91 else: 91 else:
92 print(f"# {cve} needs backporting (fixed from {last_affected})") 92 print(f"# {cve} needs backporting (fixed from {fixed})")
93 93
94 if handled: 94 if handled:
95 print(f'CVE_CHECK_IGNORE += "{cve}"') 95 print(f'CVE_CHECK_IGNORE += "{cve}"')