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: Check buffer length in GATT rsp functions #70869

Merged
merged 8 commits into from
May 5, 2024

Conversation

zephyrbot
Copy link
Collaborator

@zephyrbot zephyrbot commented Mar 28, 2024

Backport 3eeb8f8 from #69396.

Fixes: GHSA-gmfv-4vfh-2mh8
Fixes: #72140

@zephyrbot zephyrbot added Backport Backport PR and backport failure issues area: Bluetooth Host Bluetooth Host (excluding BR/EDR) area: Bluetooth labels Mar 28, 2024
@henrikbrixandersen
Copy link
Member

This needs a bug report in order to be backported - and the BSIM tests are failing in CI?

@alwa-nordic
Copy link
Collaborator

@henrikbrixandersen This is a fix for a Security Advisories, so it does not have a ticket on the issue tracker. Please advise.

I think the BSim is timing out because our CI was switched out for a potato :)

GLaDOS nest

@Thalley
Copy link
Collaborator

Thalley commented Apr 30, 2024

@henrikbrixandersen This is a fix for a Security Advisories, so it does not have a ticket on the issue tracker. Please advise.

I think the BSim is timing out because our CI was switched out for a potato :)

GLaDOS nest

@alwa-nordic looks like the connection for the BSIM was just dropped. Shouldn't we just re-run it?

@alwa-nordic
Copy link
Collaborator

@alwa-nordic looks like the connection for the BSIM was just dropped. Shouldn't we just re-run it?

It failed again. It look to me like the full parallel build is grinding the machine to a halt or running OOM. @aescolar Do you agree with my suspicion?

@aescolar
Copy link
Member

aescolar commented Apr 30, 2024

It failed again. It look to me like the full parallel build is grinding the machine to a halt or running OOM. @aescolar Do you agree with my suspicion?

It could easily be. This branch still runs too many compile jobs in parallel (which we do no do in main for a while now).

Maybe add to this PR an equivalent to the backport of 65d49cd

@alwa-nordic
Copy link
Collaborator

@henrikbrixandersen I created an issue for this backport.

aescolar added 6 commits May 2, 2024 16:25
There are quite many BT host test images being built.
Today these are all built in parallel, causing a quite
high load.

Let's split them in their separate sub-scripts,
so we don't parallelize too many builds,
and users have more granularity if they only
want to build a subset.

Signed-off-by: Alberto Escolar Piedras <[email protected]>
(cherry picked from commit 65d49cd)
Signed-off-by: Alberto Escolar Piedras <[email protected]>
The CIS tests are building quite many
apps on their own.
Let's split them in their separate sub-script,
so we don't parallelize too many builds,
and users have more granularity if they only
want to build a subset.

Signed-off-by: Alberto Escolar Piedras <[email protected]>
(cherry picked from commit 940d53e)
Signed-off-by: Alberto Escolar Piedras <[email protected]>
One of these tests has been seen failing in older slower
computers due to timeouts, let's increase the timeout so
we don't break in those cases.
Note this timeout is just a safety to eventually kill
hung simulations even if nobody presses Ctrl+C.

Signed-off-by: Alberto Escolar Piedras <[email protected]>
(cherry picked from commit d592455)
Signed-off-by: Alberto Escolar Piedras <[email protected]>
This test has been seen failing in older slower computers
due to timeouts, let's increase the timeout so we don't
break in those cases.
Note this timeout is just a safety to eventually kill
hung simulations even if nobody presses Ctrl+C.

Signed-off-by: Alberto Escolar Piedras <[email protected]>
(cherry picked from commit e9c8856)
Signed-off-by: Alberto Escolar Piedras <[email protected]>
This test has been seen failing in older slower computers
due to timeouts, let's increase the timeout so we don't
break in those cases.
Note this timeout is just a safety to eventually kill
hung simulations even if nobody presses Ctrl+C.

Signed-off-by: Alberto Escolar Piedras <[email protected]>
(cherry picked from commit 0888882)
Signed-off-by: Alberto Escolar Piedras <[email protected]>
This test has been seen failing in the new runners
due to a (realtime) timeout.
Let's double the timeout so it does not.

Signed-off-by: Alberto Escolar Piedras <[email protected]>
(cherry picked from commit f497234)
Signed-off-by: Alberto Escolar Piedras <[email protected]>
aescolar and others added 2 commits May 2, 2024 16:31
This test keeps its own partial way of running tests.
Let's have it kill stuck processes in the same way as
the rest (sending another kill 5 seconds after, and printing
a message about what happened)

Signed-off-by: Alberto Escolar Piedras <[email protected]>
(cherry picked from commit 693ae86)
Signed-off-by: Alberto Escolar Piedras <[email protected]>
Add length checks local to the parsing function. This removes the need
for a separate data validation step.

Signed-off-by: Aleksander Wasaznik <[email protected]>
(cherry picked from commit 3eeb8f8)
@aescolar
Copy link
Member

aescolar commented May 2, 2024

I just pushed an update to this PR, to include the changes we did in main to:

@aescolar
Copy link
Member

aescolar commented May 2, 2024

@henrikbrixandersen @MaureenHelm CI is green here now.

@henrikbrixandersen henrikbrixandersen merged commit f743d12 into v3.6-branch May 5, 2024
25 checks passed
@nashif nashif deleted the backport-69396-to-v3.6-branch branch November 16, 2024 12:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

8 participants