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.

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

bluetooth: Solving heap-buffer-overflow caused by memcpy. #18

Merged
merged 1 commit into from
Jan 2, 2025
Merged

bluetooth: Solving heap-buffer-overflow caused by memcpy. #18

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
10 changes: 5 additions & 5 deletions service/profiles/hfp_hf/hfp_hf_state_machine.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ typedef struct {
struct list_node node;
uint32_t cmd_code;
union {
uint8_t number[HFP_PHONENUM_DIGITS_MAX];
char number[HFP_PHONENUM_DIGITS_MAX];
Copy link
Collaborator

Choose a reason for hiding this comment

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

please fix it in another patch:
HFP_PHONENUM_DIGITS_MAX + 1

and, please also check all other codes

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK

} param;
} hf_at_cmd_t;

Expand Down Expand Up @@ -241,7 +241,7 @@ static void pending_action_create(hf_state_machine_t* hfsm, uint32_t cmd_code, v
case HFP_ATCMD_CODE_ATD:
case HFP_ATCMD_CODE_BLDN:
if (param) {
memcpy(cmd->param.number, param, sizeof(cmd->param.number) - 1);
strlcpy(cmd->param.number, (const char*)param, sizeof(cmd->param.number));
}
break;
default:
Expand Down Expand Up @@ -872,7 +872,7 @@ static void hold_call(hf_state_machine_t* hfsm)
BT_LOGE("No call to hold");
}

static void handle_dailing_fail(state_machine_t* sm, uint8_t* number)
static void handle_dailing_fail(state_machine_t* sm, char* number)
{
hf_state_machine_t* hfsm = (hf_state_machine_t*)sm;
hfp_current_call_t call = { 0 };
Expand All @@ -882,7 +882,7 @@ static void handle_dailing_fail(state_machine_t* sm, uint8_t* number)
call.state = HFP_HF_CALL_STATE_DISCONNECTED;
if (number) {
BT_LOGD("number: %s", number);
memcpy(call.number, number, sizeof(call.number));
strlcpy(call.number, number, sizeof(call.number));
}

hf_service_notify_call_state_changed(&hfsm->addr, &call);
Expand Down Expand Up @@ -1185,7 +1185,7 @@ static bool connected_process_event(state_machine_t* sm, uint32_t event, void* p
status = bt_sal_hfp_hf_dial_number(&hfsm->addr, data->string1);
if (status != BT_STATUS_SUCCESS) {
BT_LOGE("Dial number: %s failed", data->string1);
handle_dailing_fail(sm, (uint8_t*)data->string1);
handle_dailing_fail(sm, data->string1);
break;
}
update_dialing_time(sm, current_timestamp_us);
Expand Down
Loading