Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Repl deprecated CVE_CHECK_IGNORE with CVE_STATUS #6

Merged

Conversation

Jasper-Ben
Copy link

Yocto releases after Kirkstone have deprecated CVE_CHECK_IGNORE in favour of CVE_STATUS. Updating VEX handling of patched and ignored CVEs accordingly.

CVE_STATUS will also provide additional details about a specific CVE's
status, using the detail and description fields.

Attached is a vex for core-image-minimal, which has been created with this changeset:

vex.json

In order to continue support for kirkstone (an active LTS release) we would have to do one of the following before merging:

a) create release specific branches, like other OE repositories do (my preference)
b) copy the logic decode_cve_status from oe.cve_check into the bbclass

@loulou123546 WDYT?

@Jasper-Ben
Copy link
Author

It is worth mentioning that currently any CVE information that is already provided in the form of CVE_STATUS currently will not be taken into account until this is merged.

@Jasper-Ben Jasper-Ben marked this pull request as draft August 13, 2024 16:08
@Jasper-Ben
Copy link
Author

Depends on resolving #7

@Jasper-Ben Jasper-Ben force-pushed the update-to-cve-check-upstream branch from 2b01947 to 3e962f5 Compare August 13, 2024 18:59
classes/cyclonedx-export.bbclass Outdated Show resolved Hide resolved
classes/cyclonedx-export.bbclass Outdated Show resolved Hide resolved
@Jasper-Ben Jasper-Ben force-pushed the update-to-cve-check-upstream branch 3 times, most recently from b9f65b5 to b04d686 Compare August 28, 2024 19:55
@loulou123546
Copy link

So theses changes should be applied only from scarthgap version, that's it ?
I will try to get them a test if I have time today or tomorrow :)

@loulou123546 loulou123546 changed the base branch from main to scarthgap August 29, 2024 13:42
@Jasper-Ben Jasper-Ben force-pushed the update-to-cve-check-upstream branch from 89ab9e6 to f03314c Compare August 29, 2024 14:33
@Jasper-Ben
Copy link
Author

So theses changes should be applied only from scarthgap version, that's it ? I will try to get them a test if I have time today or tomorrow :)

Kind of, yes. Basically, everything after kirkstone.

So what I would do is create the branches called kirkstone and scarthgap from the current main. For bonus points we could create branches for every release between kirkstone and scarthgap (see https://wiki.yoctoproject.org/wiki/Releases) but not really required since those are all end of life.

I would then merge this into main (which in the future should correspond to poky's master branch) and cherry-pick the commit into the scarthgap branch (and if applicable in all the other release branches between kirkstone and scarthgap).

Then we need to roll out a fix to the main branch (again: which should correspond to poky master branch), since there was a breaking change in cve_check.py 9 days ago: https://git.yoctoproject.org/poky/commit/meta/lib/oe/cve_check.py?id=bf34db143956294d64998beb3a83f46c1e39d9d9

@Jasper-Ben Jasper-Ben force-pushed the update-to-cve-check-upstream branch from f03314c to 8eb6a1e Compare August 29, 2024 15:15
@Jasper-Ben
Copy link
Author

I've pushed a few fixes and rebased on current main. Tested and works now with scarthgap 👍 For poky master needs a fix that I would then provide in a separate MR

@Jasper-Ben Jasper-Ben marked this pull request as ready for review August 29, 2024 15:18
Yocto releases after Kirkstone have deprecated CVE_CHECK_IGNORE in favour of
CVE_STATUS. Updating VEX handling of patched and ignored CVEs accordingly.

CVE_STATUS will also provide additional details about a specific CVE's
status, using the detail and description fields.

Co-authored-by: Aoife Power <aoife.power@iris-sensing.com>
Signed-off-by: Jasper Orschulko <jasper@fancydomain.eu>
@Jasper-Ben Jasper-Ben force-pushed the update-to-cve-check-upstream branch from 8eb6a1e to 671fa13 Compare August 29, 2024 15:19
@Jasper-Ben
Copy link
Author

Here is an example vex built against the current scarthgap with these changes. As you can see we now also have fancy analysis descriptions where available :)

vex.json

@Jasper-Ben
Copy link
Author

TODO: for completeness sake we should also define layer depedencies and version compatibility in the layer conf.

I'll take care of it tomorrow.

When adding the commit to scarthgap (i.e. by cherry-pick) the layer compatibility will have to be adjusted.

@loulou123546 loulou123546 changed the base branch from scarthgap to main August 30, 2024 13:53
Copy link

@loulou123546 loulou123546 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Jasper-Ben
Copy link
Author

@loulou123546 I appended to the layer conf to define layer dependencies and compatible version.

This does lead to a warning because we do not define any bb files but oh well. I think this is still better than not having these defined.

I added the layer config as a separate commit so that you can easily cherry-pick and adjust for the kirkstone and scarthgap branches :)

From my point of view this is ready to be merged now

@Jasper-Ben Jasper-Ben mentioned this pull request Aug 30, 2024
@loulou123546 loulou123546 merged commit 4680f22 into savoirfairelinux:main Sep 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants