Skip to content

fix(ble_ota): fix reading of NimBLE's mbufs (AEGHB-1060) #502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 29, 2025
Merged

fix(ble_ota): fix reading of NimBLE's mbufs (AEGHB-1060) #502

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 6 additions & 23 deletions components/bluetooth/ble_profiles/esp/ble_ota/src/nimble_ota.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,14 +117,9 @@ esp_ble_ota_write_chr(struct os_mbuf *om)
esp_err_t err;
pre_enc_decrypt_arg_t pargs = {};

pargs.data_in_len = om->om_len - 3;
pargs.data_in_len = os_mbuf_len(om) - 3;

if (SLIST_NEXT(om, om_next) != NULL) {
struct os_mbuf *temp2 = SLIST_NEXT(om, om_next);
pargs.data_in_len += temp2->om_len;
}

pargs.data_in = (const char *)malloc(pargs.data_in_len * sizeof(char *));
pargs.data_in = (const char *)malloc(pargs.data_in_len);
err = os_mbuf_copydata(om, 3, pargs.data_in_len, pargs.data_in);

if (om->om_data[2] == 0xff) {
Expand Down Expand Up @@ -191,23 +186,11 @@ esp_ble_ota_write_chr(struct os_mbuf *om)
ESP_LOGD(TAG, "DEBUG: Sector:%" PRIu32 ", total length:%" PRIu32 ", length:%d", cur_sector,
fw_buf_offset, pargs.data_out_len);
#else
memcpy(fw_buf + fw_buf_offset, om->om_data + 3, om->om_len - 3);
fw_buf_offset += om->om_len - 3;

if (SLIST_NEXT(om, om_next) != NULL) {
struct os_mbuf *last;
last = om;
while (SLIST_NEXT(last, om_next) != NULL) {
struct os_mbuf *temp = SLIST_NEXT(last, om_next);
memcpy(fw_buf + fw_buf_offset, temp->om_data, temp->om_len);
fw_buf_offset += temp->om_len;
last = SLIST_NEXT(last, om_next);
temp = NULL;
}
}
os_mbuf_copydata(om, 3, os_mbuf_len(om) - 3, fw_buf + fw_buf_offset);
fw_buf_offset += os_mbuf_len(om) - 3;

ESP_LOGD(TAG, "DEBUG: Sector:%" PRIu32 ", total length:%" PRIu32 ", length:%d", cur_sector,
fw_buf_offset, om->om_len - 3);
fw_buf_offset, os_mbuf_len(om) - 3);
#endif
if (om->om_data[2] == 0xff) {
cur_packet = 0;
Expand Down Expand Up @@ -446,7 +429,7 @@ ble_ota_gatt_handler(uint16_t conn_handle, uint16_t attr_handle,
case BLE_GATT_ACCESS_OP_WRITE_CHR:

ota_char = find_ota_char_and_desr_by_handle(attr_handle);
ESP_LOGD(TAG, "client write; len = %d", ctxt->om->om_len);
ESP_LOGD(TAG, "client write; len = %d", os_mbuf_len(ctxt->om));

if (ota_char == RECV_FW_CHAR) {
if (start_ota) {
Expand Down