michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Audio: Add stream context validation for CAP acceptor

Browse source 
When the CAP acceptor role is enable, ASCS will verify
that the stream context type supplied by the client
matches the PACS available context.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2022-04-05 11:50:38 +02:00 • committed by Fabio Baltieri
commit 539ffe296e
3 changed files with 55 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

40
subsys/bluetooth/audio/ascs.c
View file

@ -552,6 +552,16 @@ static void ascs_cp_rsp_add_errno(uint8_t id, uint8_t op, int err,
case -EBADMSG:
return ascs_cp_rsp_add(id, op, BT_ASCS_RSP_INVALID_ASE_STATE,
BT_ASCS_REASON_NONE);
case -EACCES:
switch (op) {
case BT_ASCS_METADATA_OP:
return ascs_cp_rsp_add(id, op,
BT_ASCS_RSP_METADATA_REJECTED,
reason);
default:
return ascs_cp_rsp_add(id, op, BT_ASCS_RSP_UNSPECIFIED,
BT_ASCS_REASON_NONE);
}
default:
return ascs_cp_rsp_add(id, op, BT_ASCS_RSP_UNSPECIFIED,
BT_ASCS_REASON_NONE);
@ -1511,6 +1521,7 @@ static bool ascs_codec_store_metadata(struct bt_data *data, void *user_data)
struct ascs_parse_result {
int err;
size_t count;
const enum bt_audio_dir dir;
};
static bool ascs_valid_metadata_type(uint8_t type, uint8_t len)
@ -1587,15 +1598,36 @@ static bool ascs_parse_metadata(struct bt_data *data, void *user_data)
return false;
}
/* TODO: If CAP, verify context types */
/* The CAP acceptor shall not accept metadata with
* unsupported stream context.
*/
if (IS_ENABLED(CONFIG_BT_CAP_ACCEPTOR) &&
data->type == BT_AUDIO_METADATA_TYPE_STREAM_CONTEXT) {
const uint16_t context = sys_get_le16(data->data);
if (!bt_pacs_context_available(result->dir, context)) {
result->err = -EACCES;
return false;
}
}
/* TODO: The CAP acceptor should be able to verify that all CCID in
* the CCID list exists on this devices
*/
return true;
}
static int ascs_verify_metadata(const struct net_buf_simple *buf)
static int ascs_verify_metadata(const struct net_buf_simple *buf,
enum bt_audio_dir dir)
{
struct ascs_parse_result result = {
.count = 0U,
.err = 0,
.dir = dir
};
struct net_buf_simple meta_ltv;
struct ascs_parse_result result;
/* Clone the buf to avoid pulling data from the original buffer */
net_buf_simple_clone(buf, &meta_ltv);
@ -1650,7 +1682,7 @@ static int ascs_ep_set_metadata(struct bt_audio_ep *ep,
net_buf_simple_pull_mem(buf, len),
len);
err = ascs_verify_metadata(&meta_ltv);
err = ascs_verify_metadata(&meta_ltv, ep->dir);
if (err != 0) {
return err;
}

17
subsys/bluetooth/audio/pacs.c
View file

@ -36,6 +36,12 @@ NET_BUF_SIMPLE_DEFINE_STATIC(read_buf, CONFIG_BT_L2CAP_TX_MTU);
static const struct bt_audio_pacs_cb *pacs_cb;
static struct bt_pacs_context available_context = {
/* TODO: This should reflect the ongoing channel contexts */
.snk = BT_AUDIO_CONTEXT_TYPE_UNSPECIFIED,
.src = BT_AUDIO_CONTEXT_TYPE_UNSPECIFIED,
};
static void pac_data_add(struct net_buf_simple *buf, uint8_t num,
struct bt_codec_data *data)
{
@ -696,3 +702,14 @@ int bt_audio_pacs_register_cb(const struct bt_audio_pacs_cb *cb)
return 0;
}
bool bt_pacs_context_available(enum bt_audio_dir dir, uint16_t context)
{
if (IS_ENABLED(CONFIG_BT_PAC_SRC) && dir == BT_AUDIO_DIR_SOURCE) {
return (context & available_context.src) == context;
} else if (IS_ENABLED(CONFIG_BT_PAC_SNK) && dir == BT_AUDIO_DIR_SINK) {
return (context & available_context.snk) == context;
}
return false;
}

2
subsys/bluetooth/audio/pacs_internal.h
View file

@ -52,3 +52,5 @@ struct bt_pacs_context {
void bt_pacs_add_capability(enum bt_audio_dir dir);
void bt_pacs_remove_capability(enum bt_audio_dir dir);
int bt_pacs_available_contexts_changed(void);
bool bt_pacs_context_available(enum bt_audio_dir dir, uint16_t context);