mirror of
https://git.yoctoproject.org/poky
synced 2026-09-14 21:49:33 +02:00
cve_check: handle CVE_STATUS being set to the empty string
Handle CVE_STATUS[...] being set to an empty string just as if it was not set at all. This is needed for evaluated CVE_STATUS values to work, i.e. when setting not-applicable-config if a PACKAGECONFIG is disabled. (From OE-Core rev: a8ccf2abdc89cf4ae3dce1fed4163e3c1399e528) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 2c9f20f746251505d9d09262600199ffa87731a2) Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
committed by
Steve Sakoman
parent
206267f75d
commit
617c24aed8
@@ -231,7 +231,7 @@ def decode_cve_status(d, cve):
|
|||||||
Convert CVE_STATUS into status, detail and description.
|
Convert CVE_STATUS into status, detail and description.
|
||||||
"""
|
"""
|
||||||
status = d.getVarFlag("CVE_STATUS", cve)
|
status = d.getVarFlag("CVE_STATUS", cve)
|
||||||
if status is None:
|
if not status:
|
||||||
return ("", "", "")
|
return ("", "", "")
|
||||||
|
|
||||||
status_split = status.split(':', 1)
|
status_split = status.split(':', 1)
|
||||||
@@ -240,7 +240,7 @@ def decode_cve_status(d, cve):
|
|||||||
|
|
||||||
status_mapping = d.getVarFlag("CVE_CHECK_STATUSMAP", detail)
|
status_mapping = d.getVarFlag("CVE_CHECK_STATUSMAP", detail)
|
||||||
if status_mapping is None:
|
if status_mapping is None:
|
||||||
bb.warn('Invalid detail %s for CVE_STATUS[%s] = "%s", fallback to Unpatched' % (detail, cve, status))
|
bb.warn('Invalid detail "%s" for CVE_STATUS[%s] = "%s", fallback to Unpatched' % (detail, cve, status))
|
||||||
status_mapping = "Unpatched"
|
status_mapping = "Unpatched"
|
||||||
|
|
||||||
return (status_mapping, detail, description)
|
return (status_mapping, detail, description)
|
||||||
|
|||||||
Reference in New Issue
Block a user