From: Szymon Janc <szymon.janc@gmail.com>
To: linux-bluetooth@vger.kernel.org
Cc: Szymon Janc <szymon.janc@gmail.com>
Subject: [PATCH 4/4] android/hidhost: Move set_report parameter check to daemon
Date: Mon, 30 Dec 2013 23:56:20 +0100 [thread overview]
Message-ID: <1388444180-13683-4-git-send-email-szymon.janc@gmail.com> (raw)
In-Reply-To: <1388444180-13683-1-git-send-email-szymon.janc@gmail.com>
HAL library is to be as simple as possible and parameters values should
be verified by daemon for robustness anyway. Move this check to daemon.
---
android/hal-hidhost.c | 15 ++-------------
android/hidhost.c | 10 ++++++++++
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/android/hal-hidhost.c b/android/hal-hidhost.c
index 371250a..fd3ad2d 100644
--- a/android/hal-hidhost.c
+++ b/android/hal-hidhost.c
@@ -294,19 +294,8 @@ static bt_status_t set_report(bt_bdaddr_t *bd_addr,
cmd->len = strlen(report);
memcpy(cmd->data, report, cmd->len);
- switch (report_type) {
- case BTHH_INPUT_REPORT:
- cmd->type = HAL_HIDHOST_INPUT_REPORT;
- break;
- case BTHH_OUTPUT_REPORT:
- cmd->type = HAL_HIDHOST_OUTPUT_REPORT;
- break;
- case BTHH_FEATURE_REPORT:
- cmd->type = HAL_HIDHOST_FEATURE_REPORT;
- break;
- default:
- return BT_STATUS_PARM_INVALID;
- }
+ /* type match IPC type */
+ cmd->type = report_type;
return hal_ipc_cmd(HAL_SERVICE_ID_HIDHOST, HAL_OP_HIDHOST_SET_REPORT,
sizeof(*cmd) + cmd->len, buf, 0, NULL, NULL);
diff --git a/android/hidhost.c b/android/hidhost.c
index 1cf85b1..aed9899 100644
--- a/android/hidhost.c
+++ b/android/hidhost.c
@@ -1064,6 +1064,16 @@ static void bt_hid_set_report(const void *buf, uint16_t len)
return;
}
+ switch (cmd->type) {
+ case HAL_HIDHOST_INPUT_REPORT:
+ case HAL_HIDHOST_OUTPUT_REPORT:
+ case HAL_HIDHOST_FEATURE_REPORT:
+ break;
+ default:
+ status = HAL_STATUS_INVALID;
+ goto failed;
+ }
+
android2bdaddr(&cmd->bdaddr, &dst);
l = g_slist_find_custom(devices, &dst, device_cmp);
--
1.8.5.2
next prev parent reply other threads:[~2013-12-30 22:56 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-30 22:56 [PATCH 1/4] android/hidhost: Move get_protocol parameter check to daemon Szymon Janc
2013-12-30 22:56 ` [PATCH 2/4] android/hidhost: Move set_protocol " Szymon Janc
2013-12-30 22:56 ` [PATCH 3/4] android/hidhost: Move get_report " Szymon Janc
2013-12-30 22:56 ` Szymon Janc [this message]
2013-12-31 9:35 ` [PATCH 1/4] android/hidhost: Move get_protocol " Johan Hedberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1388444180-13683-4-git-send-email-szymon.janc@gmail.com \
--to=szymon.janc@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox