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

[backport v3.6-branch] Bluetooth: host: sched-lock bt_recv() #75361

Merged

Conversation

jhedberg
Copy link
Member

@jhedberg jhedberg commented Jul 3, 2024

bt_recv is invoked from the BT long work queue, which is preemptible. The host uses cooperative scheduling to ensure thread safety.

Fixes: GHSA-jmr9-xw2v-5vf4

`bt_recv` is invoked from the BT long work queue, which is preemptible.
The host uses cooperative scheduling to ensure thread safety.

Signed-off-by: Aleksander Wasaznik <[email protected]>
@alwa-nordic alwa-nordic linked an issue Jul 3, 2024 that may be closed by this pull request
@henrikbrixandersen henrikbrixandersen added this to the v3.6.1 milestone Jul 5, 2024
@henrikbrixandersen
Copy link
Member

I have removed "Fixes #75356" from the description, as that is just the issue for the failed backport. This needs a proper bug issue in order to be backported.

@henrikbrixandersen henrikbrixandersen added the DNM This PR should not be merged (Do Not Merge) label Jul 5, 2024
@jhedberg
Copy link
Member Author

jhedberg commented Jul 5, 2024

This needs a proper bug issue in order to be backported.

Isn't the referenced advisory (which is now also public) essentially a bug report?

@jhedberg
Copy link
Member Author

jhedberg commented Jul 5, 2024

I have removed "Fixes #75356" from the description, as that is just the issue for the failed backport.

Should that just be closed then? I thought it would have been natural to close it automatically when this PR gets merged (hence the reference) but I guess it's also fair to say that already the creation of this PR is in itself a fix for the automated backport failure.

@henrikbrixandersen
Copy link
Member

This needs a proper bug issue in order to be backported.

Isn't the referenced advisory (which is now also public) essentially a bug report?

First time I have seen that. We usually require a bug report issue for justifying a backport. @ceolin, @nashif?

@henrikbrixandersen
Copy link
Member

I have removed "Fixes #75356" from the description, as that is just the issue for the failed backport.

Should that just be closed then? I thought it would have been natural to close it automatically when this PR gets merged (hence the reference) but I guess it's also fair to say that already the creation of this PR is in itself a fix for the automated backport failure.

It's fine to close it when this is merged, but it doesn't provide justification for merging the backport (and as such should not cause the backport CI check to succeed).

@henrikbrixandersen henrikbrixandersen removed the DNM This PR should not be merged (Do Not Merge) label Aug 5, 2024
@henrikbrixandersen
Copy link
Member

@jhedberg This is still pending a bug report.

@jhedberg
Copy link
Member Author

jhedberg commented Aug 8, 2024

@jhedberg This is still pending a bug report.

Again, IMO the referenced public security advisory is the bug report and there shouldn't be a need to introduce additional bureaucracy in this case.

@henrikbrixandersen
Copy link
Member

@jhedberg This is still pending a bug report.

Again, IMO the referenced public security advisory is the bug report and there shouldn't be a need to introduce additional bureaucracy in this case.

I am only following our established process.

@jhedberg
Copy link
Member Author

jhedberg commented Aug 8, 2024

@jhedberg This is still pending a bug report.

Again, IMO the referenced public security advisory is the bug report and there shouldn't be a need to introduce additional bureaucracy in this case.

I am only following our established process.

Understood, but I think it's also everyone's duty to call out issues with it when we see them. I think in this case it's also up for interpretation, i.e. do you consider a security advisory a bug report or not (I do). Based on #75361 (comment) it seems like you're still waiting for additional feedback on this.

@jori-nordic
Copy link
Collaborator

shouldn't be a need to introduce additional bureaucracy in this case

A hundred times, yes. @henrikbrixandersen instead of nagging people, and wasting time arguing from both sides: could we use the github checks to enforce this? Then there will be no discussion.

@henrikbrixandersen
Copy link
Member

A hundred times, yes. @henrikbrixandersen instead of nagging people, and wasting time arguing from both sides: could we use the github checks to enforce this? Then there will be no discussion.

The GitHub check already verifies that a backport description contains a "Fixes:" line - this one does, but it does not refer to a bug issue, which deviates from our established process.

@jori-nordic
Copy link
Collaborator

but it does not refer to a bug issue, which deviates from our established process

Then fix the check. What's the point of checks if we still have to manually check??

@dkalowsk
Copy link
Contributor

dkalowsk commented Aug 9, 2024

In the past (at least on the 2.7.5 branch) when we had to deprecate TF-M support due to multiple vulnerabilities, we had #56071 filed to track it. A large part of the issue inclusion (in my view) is to ensure the change gets properly called out in the release notes automation.

@jori-nordic
Copy link
Collaborator

properly called out in the release notes automation

Again, can't we fix the release automation to also track published Security Advisories?

@henrikbrixandersen henrikbrixandersen added DNM This PR should not be merged (Do Not Merge) Process Tracked by the process WG labels Aug 12, 2024
@ceolin
Copy link
Member

ceolin commented Aug 13, 2024

Hi,

I think it is redundant to have issues for published advisories. Backporting these fixes is already documented in https://docs.zephyrproject.org/latest/security/reporting.html#backporting-of-security-vulnerabilities.

We do need issues for unpublished advisories, as the vulnerability is still under embargo, but we must avoid making it obvious that a specific PR is addressing the vulnerability.

@henrikbrixandersen henrikbrixandersen removed the DNM This PR should not be merged (Do Not Merge) label Aug 14, 2024
@henrikbrixandersen
Copy link
Member

On today's Process WG meeting, it was decided to update https://github.com/zephyrproject-rtos/zephyr/wiki/Zephyr-Change-Control-Board-(CCB) to also allow published security advisories as justification for backporting.

@MaureenHelm MaureenHelm merged commit d5a127a into zephyrproject-rtos:v3.6-branch Aug 14, 2024
27 of 30 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Status: Done
Development

Successfully merging this pull request may close these issues.

[Backport v3.6-branch] Failed to backport #71030
10 participants