alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

BLE provisioning: Add check for valid ble read offset

Browse Source
This commit is contained in:
Prasad Alatkar 2020-06-09 23:16:11 +05:30 committed by bot
parent 1fa7454f5e
commit 457d4f36a6
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
components/protocomm/src/transports/protocomm_ble.c
View File

@ -108,28 +108,39 @@ static void transport_simple_ble_read(esp_gatts_cb_event_t event, esp_gatt_if_t
{ {
static const uint8_t *read_buf = NULL; static const uint8_t *read_buf = NULL;
static uint16_t read_len = 0; static uint16_t read_len = 0;
static uint16_t max_read_len = 0;
esp_gatt_status_t status = ESP_OK; esp_gatt_status_t status = ESP_OK;
ESP_LOGD(TAG, "Inside read w/ session - %d on param %d %d", ESP_LOGD(TAG, "Inside read w/ session - %d on param %d %d",
param->read.conn_id, param->read.handle, read_len); param->read.conn_id, param->read.handle, read_len);
if (!read_len && !param->read.offset) { if (!read_len && !param->read.offset) {
ESP_LOGD(TAG, "Reading attr value first time"); ESP_LOGD(TAG, "Reading attr value first time");
status = esp_ble_gatts_get_attr_value(param->read.handle, &read_len, &read_buf); status = esp_ble_gatts_get_attr_value(param->read.handle, &read_len, &read_buf);
max_read_len = read_len;
} else if ((read_len + param->read.offset) > max_read_len) {
status = ESP_GATT_INVALID_OFFSET;
} else { } else {
ESP_LOGD(TAG, "Subsequent read request for attr value"); ESP_LOGD(TAG, "Subsequent read request for attr value");
} }
esp_gatt_rsp_t gatt_rsp = {0}; esp_gatt_rsp_t gatt_rsp = {0};
gatt_rsp.attr_value.len = MIN(read_len, (protoble_internal->gatt_mtu - 1));
gatt_rsp.attr_value.handle = param->read.handle; gatt_rsp.attr_value.handle = param->read.handle;
gatt_rsp.attr_value.offset = param->read.offset; gatt_rsp.attr_value.offset = param->read.offset;
gatt_rsp.attr_value.auth_req = ESP_GATT_AUTH_REQ_NONE;
if (gatt_rsp.attr_value.len && read_buf) { if (status == ESP_GATT_OK) {
memcpy(gatt_rsp.attr_value.value, gatt_rsp.attr_value.len = MIN(read_len, (protoble_internal->gatt_mtu - 1));
read_buf + param->read.offset, gatt_rsp.attr_value.auth_req = ESP_GATT_AUTH_REQ_NONE;
gatt_rsp.attr_value.len); if (gatt_rsp.attr_value.len && read_buf) {
memcpy(gatt_rsp.attr_value.value,
read_buf + param->read.offset,
gatt_rsp.attr_value.len);
}
read_len -= gatt_rsp.attr_value.len;
} else {
read_len = 0;
max_read_len = 0;
read_buf = NULL;
} }
read_len -= gatt_rsp.attr_value.len;
esp_err_t err = esp_ble_gatts_send_response(gatts_if, param->read.conn_id, esp_err_t err = esp_ble_gatts_send_response(gatts_if, param->read.conn_id,
param->read.trans_id, status, &gatt_rsp); param->read.trans_id, status, &gatt_rsp);
if (err != ESP_OK) { if (err != ESP_OK) {