michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests: Bluetooth: Tester: Fix use of uninitialized cig_id for CAP

Browse source 
The CAP tests used u_group->cig->index but the u_group->cig may
have been deleted when the stream is released, which meant
that u_group->cig == NULL when e.g. unicast_stop_complete_cb
was called and that could cause failing tests as the index
would just be a uninitialized value.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2024-10-28 15:36:52 +01:00 • committed by Mahesh Mahadevan
commit 5ebe1194be
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tests/bluetooth/tester/src/audio/btp_bap_unicast.c
View file

@ -1140,6 +1140,7 @@ int btp_bap_unicast_group_create(uint8_t cig_id,
} }
cigs[cig_id].in_use = true; cigs[cig_id].in_use = true;
cigs[cig_id].cig_id = cig_id;
*out_unicast_group = &cigs[cig_id]; *out_unicast_group = &cigs[cig_id];
return 0; return 0;

4
tests/bluetooth/tester/src/audio/btp_bap_unicast.h
View file

@ -2,10 +2,13 @@
/* /*
* Copyright (c) 2023 Codecoup * Copyright (c) 2023 Codecoup
* Copyright (c) 2024 Nordic Semiconductor ASA
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#include <stdint.h>
#include <zephyr/bluetooth/audio/cap.h> #include <zephyr/bluetooth/audio/cap.h>
#define BTP_BAP_UNICAST_MAX_SNK_STREAMS_COUNT MIN(CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SNK_COUNT, \ #define BTP_BAP_UNICAST_MAX_SNK_STREAMS_COUNT MIN(CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SNK_COUNT, \
@ -20,6 +23,7 @@
struct btp_bap_unicast_group { struct btp_bap_unicast_group {
struct bt_bap_qos_cfg qos[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT]; struct bt_bap_qos_cfg qos[CONFIG_BT_BAP_UNICAST_CLIENT_GROUP_STREAM_COUNT];
struct bt_bap_unicast_group *cig; struct bt_bap_unicast_group *cig;
uint8_t cig_id;
bool in_use; bool in_use;
}; };

8
tests/bluetooth/tester/src/audio/btp_cap.c
View file

@ -104,13 +104,13 @@ static void unicast_start_complete_cb(int err, struct bt_conn *conn)
if (err != 0) { if (err != 0) {
LOG_DBG("Failed to unicast-start, err %d", err); LOG_DBG("Failed to unicast-start, err %d", err);
btp_send_cap_unicast_start_completed_ev(u_group->cig->index, btp_send_cap_unicast_start_completed_ev(u_group->cig_id,
BTP_CAP_UNICAST_START_STATUS_FAILED); BTP_CAP_UNICAST_START_STATUS_FAILED);
return; return;
} }
btp_send_cap_unicast_start_completed_ev(u_group->cig->index, btp_send_cap_unicast_start_completed_ev(u_group->cig_id,
BTP_CAP_UNICAST_START_STATUS_SUCCESS); BTP_CAP_UNICAST_START_STATUS_SUCCESS);
} }
@ -129,13 +129,13 @@ static void unicast_stop_complete_cb(int err, struct bt_conn *conn)
if (err != 0) { if (err != 0) {
LOG_DBG("Failed to unicast-stop, err %d", err); LOG_DBG("Failed to unicast-stop, err %d", err);
btp_send_cap_unicast_stop_completed_ev(u_group->cig->index, btp_send_cap_unicast_stop_completed_ev(u_group->cig_id,
BTP_CAP_UNICAST_START_STATUS_FAILED); BTP_CAP_UNICAST_START_STATUS_FAILED);
return; return;
} }
btp_send_cap_unicast_stop_completed_ev(u_group->cig->index, btp_send_cap_unicast_stop_completed_ev(u_group->cig_id,
BTP_CAP_UNICAST_START_STATUS_SUCCESS); BTP_CAP_UNICAST_START_STATUS_SUCCESS);
} }