bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bluetooth: host: L2CAP: Fix configuration parameters not be checked

Browse Source 
Now in other mode rather than basic mode, configuration parameters
include MTU, Flush Time and QoS have been checked.
But in basic mode, they also need to be checked, so the code about this
should not be controlled by macro CONFIG_BT_L2CAP_RET_FC.

Signed-off-by: Cheng Chang <cheng.chang@nxp.com>
This commit is contained in:
Cheng Chang 2025-07-08 12:45:38 +08:00 committed by Alberto Escolar
parent 735e5cb6c4
commit 5b204de53a
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
subsys/bluetooth/host/classic/l2cap_br.c
View File

@ -2694,7 +2694,6 @@ no_chan:
#define L2CAP_QOS_LATENCY_DEFAULT 0xffffffff
#define L2CAP_QOS_DELAY_DEFAULT 0xffffffff
#if defined(CONFIG_BT_L2CAP_RET_FC)
static uint16_t l2cap_br_conf_rsp_opt_mtu(struct bt_l2cap_chan *chan, struct net_buf *buf,
size_t len)
{
@ -2810,6 +2809,7 @@ done:
return result;
}
#if defined(CONFIG_BT_L2CAP_RET_FC)
static uint16_t l2cap_br_conf_rsp_opt_ret_fc(struct bt_l2cap_chan *chan, struct net_buf *buf,
size_t len)
{
@ -3073,6 +3073,7 @@ static uint16_t l2cap_br_conf_rsp_opt_ext_win_size(struct bt_l2cap_chan *chan, s
done:
return result;
}
#endif /* CONFIG_BT_L2CAP_RET_FC */
static int l2cap_br_conf_rsp_opt_check(struct bt_l2cap_chan *chan, uint16_t opt_len,
struct net_buf *buf)
@ -3122,6 +3123,7 @@ static int l2cap_br_conf_rsp_opt_check(struct bt_l2cap_chan *chan, uint16_t opt_
goto invalid_opt;
}
break;
#if defined(CONFIG_BT_L2CAP_RET_FC)
case BT_L2CAP_CONF_OPT_RET_FC:
result = l2cap_br_conf_rsp_opt_ret_fc(chan, buf, opt->len);
if (result != BT_L2CAP_CONF_SUCCESS) {
@ -3146,6 +3148,7 @@ static int l2cap_br_conf_rsp_opt_check(struct bt_l2cap_chan *chan, uint16_t opt_
goto invalid_opt;
}
break;
#endif /* CONFIG_BT_L2CAP_RET_FC */
default:
result = BT_L2CAP_CONF_UNKNOWN_OPT;
goto invalid_opt;
@ -3153,6 +3156,7 @@ static int l2cap_br_conf_rsp_opt_check(struct bt_l2cap_chan *chan, uint16_t opt_
net_buf_pull(buf, opt->len);
}
#if defined(CONFIG_BT_L2CAP_RET_FC)
if (BR_CHAN(chan)->rx.fcs == BT_L2CAP_BR_FCS_16BIT) {
/* If local enable FCS, peer also needs to enable it. */
BR_CHAN(chan)->tx.fcs = BT_L2CAP_BR_FCS_16BIT;
@ -3164,6 +3168,7 @@ static int l2cap_br_conf_rsp_opt_check(struct bt_l2cap_chan *chan, uint16_t opt_
*/
BR_CHAN(chan)->tx.extended_control = true;
}
#endif /* CONFIG_BT_L2CAP_RET_FC */
return 0;
@ -3267,6 +3272,7 @@ done:
return result;
}
#if defined(CONFIG_BT_L2CAP_RET_FC)
static uint16_t l2cap_br_conf_rsp_unaccept_opt_ret_fc(struct bt_l2cap_chan *chan,
struct net_buf *buf, size_t len)
{
@ -3475,6 +3481,7 @@ static uint16_t l2cap_br_conf_rsp_unaccept_opt_ext_win_size(struct bt_l2cap_chan
done:
return result;
}
#endif /* CONFIG_BT_L2CAP_RET_FC */
static int l2cap_br_conf_rsp_unaccept_opt(struct bt_l2cap_chan *chan, uint16_t opt_len,
struct net_buf *buf)
@ -3524,6 +3531,7 @@ static int l2cap_br_conf_rsp_unaccept_opt(struct bt_l2cap_chan *chan, uint16_t o
goto invalid_opt;
}
break;
#if defined(CONFIG_BT_L2CAP_RET_FC)
case BT_L2CAP_CONF_OPT_RET_FC:
result = l2cap_br_conf_rsp_unaccept_opt_ret_fc(chan, buf, opt->len);
if (result != BT_L2CAP_CONF_SUCCESS) {
@ -3548,6 +3556,7 @@ static int l2cap_br_conf_rsp_unaccept_opt(struct bt_l2cap_chan *chan, uint16_t o
goto invalid_opt;
}
break;
#endif /* CONFIG_BT_L2CAP_RET_FC */
default:
result = BT_L2CAP_CONF_UNKNOWN_OPT;
goto invalid_opt;
@ -3555,17 +3564,17 @@ static int l2cap_br_conf_rsp_unaccept_opt(struct bt_l2cap_chan *chan, uint16_t o
net_buf_pull(buf, opt->len);
}
#if defined(CONFIG_BT_L2CAP_RET_FC)
if (BR_CHAN(chan)->rx.fcs == BT_L2CAP_BR_FCS_16BIT) {
/* If local enable FCS, peer also needs to enable it. */
BR_CHAN(chan)->tx.fcs = BT_L2CAP_BR_FCS_16BIT;
}
#endif /* CONFIG_BT_L2CAP_RET_FC */
return 0;
invalid_opt:
return -EINVAL;
}
#endif /* CONFIG_BT_L2CAP_RET_FC */
static void l2cap_br_conf_rsp(struct bt_l2cap_br *l2cap, uint8_t ident, uint16_t len,
struct net_buf *buf)
@ -3575,9 +3584,7 @@ static void l2cap_br_conf_rsp(struct bt_l2cap_br *l2cap, uint8_t ident, uint16_t
struct bt_l2cap_conf_rsp *rsp = (void *)buf->data;
uint16_t flags, scid, result, opt_len;
struct bt_l2cap_br_chan *br_chan;
#if defined(CONFIG_BT_L2CAP_RET_FC)
int err;
#endif /* CONFIG_BT_L2CAP_RET_FC */
if (buf->len < sizeof(*rsp)) {
LOG_ERR("Too small L2CAP conf rsp packet size");
@ -3616,14 +3623,12 @@ static void l2cap_br_conf_rsp(struct bt_l2cap_br *l2cap, uint8_t ident, uint16_t
switch (result) {
case BT_L2CAP_CONF_SUCCESS:
atomic_set_bit(br_chan->flags, L2CAP_FLAG_CONN_LCONF_DONE);
#if defined(CONFIG_BT_L2CAP_RET_FC)
err = l2cap_br_conf_rsp_opt_check(chan, opt_len, buf);
if (err) {
/* currently disconnect channel if opt is invalid */
bt_l2cap_chan_disconnect(chan);
break;
}
#endif /* CONFIG_BT_L2CAP_RET_FC */
if (br_chan->state == BT_L2CAP_CONFIG &&
atomic_test_bit(br_chan->flags, L2CAP_FLAG_CONN_RCONF_DONE)) {
LOG_DBG("scid 0x%04x rx MTU %u dcid 0x%04x tx MTU %u", br_chan->rx.cid,
@ -3635,7 +3640,6 @@ static void l2cap_br_conf_rsp(struct bt_l2cap_br *l2cap, uint8_t ident, uint16_t
}
}
break;
#if defined(CONFIG_BT_L2CAP_RET_FC)
case BT_L2CAP_CONF_UNACCEPT:
err = l2cap_br_conf_rsp_unaccept_opt(chan, opt_len, buf);
if (!err) {
@ -3643,7 +3647,6 @@ static void l2cap_br_conf_rsp(struct bt_l2cap_br *l2cap, uint8_t ident, uint16_t
break;
}
__fallthrough;
#endif /* CONFIG_BT_L2CAP_RET_FC */
default:
/* currently disconnect channel on non success result */
bt_l2cap_chan_disconnect(chan);