Просмотр исходного кода

Merge branch 'bugfix/ble_mesh_rework_prov_pdu_len_check' into 'master'

ble_mesh: Rework prov pdu length check

See merge request espressif/esp-idf!8993
Island 5 лет назад
Родитель
Сommit
ae2898f12e

+ 1 - 1
components/bt/esp_ble_mesh/mesh_core/prov.c

@@ -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;
     }
 

+ 1 - 1
components/bt/esp_ble_mesh/mesh_core/provisioner_prov.c

@@ -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;
     }