korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-12-26 20:33:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

android/hidhost: Check if hex2buf succeed

Browse Source 
Fail if received string contains illegal characters.
This commit is contained in:
Szymon Janc 2014-04-18 15:40:06 +02:00
parent c803cf88eb
commit 40f7f261d2
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
android/hidhost.c
View File

@ -1129,7 +1129,7 @@ static void bt_hid_set_report(const void *buf, uint16_t len)
GSList *l;
bdaddr_t dst;
int fd;
uint8_t *req;
uint8_t *req = NULL;
uint8_t req_size;
uint8_t status;
@ -1177,24 +1177,27 @@ static void bt_hid_set_report(const void *buf, uint16_t len)
req[0] = HID_MSG_SET_REPORT | cmd->type;
/* Report data coming to HAL is in ascii format, HAL sends
* data in hex to daemon, so convert to binary. */
hex2buf(cmd->data, req + 1, req_size - 1);
if (!hex2buf(cmd->data, req + 1, req_size - 1)) {
status = HAL_STATUS_INVALID;
goto failed;
}
fd = g_io_channel_unix_get_fd(dev->ctrl_io);
if (write(fd, req, req_size) < 0) {
error("error writing hid_set_report: %s (%d)",
strerror(errno), errno);
g_free(req);
status = HAL_STATUS_FAILED;
goto failed;
}
dev->last_hid_msg = HID_MSG_SET_REPORT;
g_free(req);
status = HAL_STATUS_SUCCESS;
failed:
g_free(req);
ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_HIDHOST, HAL_OP_HIDHOST_SET_REPORT,
status);
}
@ -1206,7 +1209,7 @@ static void bt_hid_send_data(const void *buf, uint16_t len)
GSList *l;
bdaddr_t dst;
int fd;
uint8_t *req;
uint8_t *req = NULL;
uint8_t req_size;
uint8_t status;
@ -1244,23 +1247,25 @@ static void bt_hid_send_data(const void *buf, uint16_t len)
req[0] = HID_MSG_DATA | HID_DATA_TYPE_OUTPUT;
/* Report data coming to HAL is in ascii format, HAL sends
* data in hex to daemon, so convert to binary. */
hex2buf(cmd->data, req + 1, req_size - 1);
if (!hex2buf(cmd->data, req + 1, req_size - 1)) {
status = HAL_STATUS_INVALID;
goto failed;
}
fd = g_io_channel_unix_get_fd(dev->intr_io);
if (write(fd, req, req_size) < 0) {
error("error writing data to HID device: %s (%d)",
strerror(errno), errno);
g_free(req);
status = HAL_STATUS_FAILED;
goto failed;
}
g_free(req);
status = HAL_STATUS_SUCCESS;
failed:
g_free(req);
ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_HIDHOST, HAL_OP_HIDHOST_SEND_DATA,
status);
}