Merge branch 'bugfix/ble_mesh_rework_prov_pdu_len_check_v3.3' into 'release/v3.3'

ble_mesh: Rework prov pdu length check (v3.3)

See merge request espressif/esp-idf!9005
This commit is contained in:
Island 2020-06-03 15:11:11 +08:00
commit 88937185ac
2 changed files with 2 additions and 2 deletions

View file

@ -1546,7 +1546,7 @@ static void gen_prov_start(struct prov_rx *rx, struct net_buf_simple *buf)
if (link.rx.buf->len > link.rx.buf->size) {
BT_ERR("%s, Too large provisioning PDU (%u bytes)",
__func__, link.rx.buf->len);
/* Zephyr uses prov_send_fail_msg() here */
prov_send_fail_msg(PROV_ERR_NVAL_FMT);
return;
}

View file

@ -3039,7 +3039,7 @@ static void gen_prov_start(const u8_t idx, struct prov_rx *rx, struct net_buf_si
if (link[idx].rx.buf->len > link[idx].rx.buf->size) {
BT_ERR("%s, Too large provisioning PDU (%u bytes)",
__func__, link[idx].rx.buf->len);
// close_link(i, CLOSE_REASON_FAILED);
close_link(idx, CLOSE_REASON_FAILED);
return;
}