Skip to content

bluetooth: shell: fix AD length validation #101365

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.

Sign up for GitHub

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

Open
SrivastavaOm29 wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −7
Open

bluetooth: shell: fix AD length validation #101365

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions subsys/bluetooth/host/shell/bt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5176,13 +5176,13 @@ int ead_update_ad(void)
while (idx < bt_shell_ead_data_size && ad_structs_idx < BT_SHELL_EAD_MAX_AD) {
ad = &ad_structs[ad_structs_idx];

/* the data_len from bt_data struct doesn't include the size of the type */
ad->data_len = bt_shell_ead_data[idx] - 1;

if (ad->data_len < 0) {
/* if the len is less than 0 that mean there is not even a type field */
bt_shell_error("Failed to update AD due to malformed AD.");
return -ENOEXEC;
/* bt_shell_ead_data[idx] includes the AD type byte. */
if (bt_shell_ead_data[idx] > 0) {
ad->data_len = bt_shell_ead_data[idx] - 1;
} else {
/* Zero length means the AD field does not even contain a type */
bt_shell_error("Failed to update AD due to malformed AD.");
return -ENOEXEC;
}

ad->type = bt_shell_ead_data[idx + 1];
Expand Down