* [PATCH 2/4] Bluetooth: mgmt: Add support for Set Link Security command
2012-02-16 23:22 [PATCH 1/4] Bluetooth: Remove unused member from cmd_lookup struct johan.hedberg
@ 2012-02-16 23:22 ` johan.hedberg
2012-02-16 23:39 ` Johan Hedberg
2012-02-17 8:33 ` Marcel Holtmann
2012-02-16 23:22 ` [PATCH 3/4] Bluetooth: mgmt: Implement Set SSP command johan.hedberg
` (2 subsequent siblings)
3 siblings, 2 replies; 9+ messages in thread
From: johan.hedberg @ 2012-02-16 23:22 UTC (permalink / raw)
To: linux-bluetooth
From: Johan Hedberg <johan.hedberg@intel.com>
The Set Link Security mgmt command is used to enable or disable link
level security, also known as Security Mode 3. This is rarely enabled in
modern systems but the command needs to be available for completeness,
qualification purposes and those few systems that actually want to
enable it.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---
include/net/bluetooth/hci_core.h | 1 +
net/bluetooth/hci_event.c | 3 +
net/bluetooth/mgmt.c | 81 ++++++++++++++++++++++++++++++++++++++
3 files changed, 85 insertions(+), 0 deletions(-)
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index b20d990..66f84ad 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -994,6 +994,7 @@ int mgmt_user_passkey_neg_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr,
u8 link_type, u8 addr_type, u8 status);
int mgmt_auth_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
u8 addr_type, u8 status);
+int mgmt_auth_enable_complete(struct hci_dev *hdev, u8 status);
int mgmt_set_local_name_complete(struct hci_dev *hdev, u8 *name, u8 status);
int mgmt_read_local_oob_data_reply_complete(struct hci_dev *hdev, u8 *hash,
u8 *randomizer, u8 status);
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index b0784ee..239e9fb 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -254,6 +254,9 @@ static void hci_cc_write_auth_enable(struct hci_dev *hdev, struct sk_buff *skb)
clear_bit(HCI_AUTH, &hdev->flags);
}
+ if (test_bit(HCI_MGMT, &hdev->dev_flags))
+ mgmt_auth_enable_complete(hdev, status);
+
hci_req_complete(hdev, HCI_OP_WRITE_AUTH_ENABLE, status);
}
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 5520858..e38b3cb 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -964,6 +964,59 @@ failed:
return err;
}
+static int set_link_security(struct sock *sk, u16 index, void *data, u16 len)
+{
+ struct mgmt_mode *cp = data;
+ struct pending_cmd *cmd;
+ struct hci_dev *hdev;
+ uint8_t val;
+ int err;
+
+ BT_DBG("request for hci%u", index);
+
+ if (len != sizeof(*cp))
+ return cmd_status(sk, index, MGMT_OP_SET_LINK_SECURITY,
+ MGMT_STATUS_INVALID_PARAMS);
+
+ hdev = hci_dev_get(index);
+ if (!hdev)
+ return cmd_status(sk, index, MGMT_OP_SET_LINK_SECURITY,
+ MGMT_STATUS_INVALID_PARAMS);
+
+ hci_dev_lock(hdev);
+
+ if (mgmt_pending_find(MGMT_OP_SET_LINK_SECURITY, hdev)) {
+ err = cmd_status(sk, index, MGMT_OP_SET_LINK_SECURITY,
+ MGMT_STATUS_BUSY);
+ goto failed;
+ }
+
+ val = !!cp->val;
+
+ if (test_bit(HCI_AUTH, &hdev->flags) == val) {
+ err = send_settings_rsp(sk, MGMT_OP_SET_LINK_SECURITY, hdev);
+ goto failed;
+ }
+
+ cmd = mgmt_pending_add(sk, MGMT_OP_SET_LINK_SECURITY, hdev, data, len);
+ if (!cmd) {
+ err = -ENOMEM;
+ goto failed;
+ }
+
+ err = hci_send_cmd(hdev, HCI_OP_WRITE_AUTH_ENABLE, sizeof(val), &val);
+ if (err < 0) {
+ mgmt_pending_remove(cmd);
+ goto failed;
+ }
+
+failed:
+ hci_dev_unlock(hdev);
+ hci_dev_put(hdev);
+
+ return err;
+}
+
static int add_uuid(struct sock *sk, u16 index, void *data, u16 len)
{
struct mgmt_cp_add_uuid *cp = data;
@@ -2443,6 +2496,9 @@ int mgmt_control(struct sock *sk, struct msghdr *msg, size_t msglen)
case MGMT_OP_SET_PAIRABLE:
err = set_pairable(sk, index, cp, len);
break;
+ case MGMT_OP_SET_LINK_SECURITY:
+ err = set_link_security(sk, index, cp, len);
+ break;
case MGMT_OP_ADD_UUID:
err = add_uuid(sk, index, cp, len);
break;
@@ -2965,6 +3021,31 @@ int mgmt_auth_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
return mgmt_event(MGMT_EV_AUTH_FAILED, hdev, &ev, sizeof(ev), NULL);
}
+int mgmt_auth_enable_complete(struct hci_dev *hdev, u8 status)
+{
+ struct cmd_lookup match = { NULL, hdev };
+ __le32 ev;
+ int err;
+
+ if (status) {
+ u8 mgmt_err = mgmt_status(status);
+ mgmt_pending_foreach(MGMT_OP_SET_LINK_SECURITY, hdev,
+ cmd_status_rsp, &mgmt_err);
+ return 0;
+ }
+
+ mgmt_pending_foreach(MGMT_OP_SET_LINK_SECURITY, hdev, settings_rsp,
+ &match);
+
+ ev = cpu_to_le32(get_current_settings(hdev));
+ err = mgmt_event(MGMT_EV_NEW_SETTINGS, hdev, &ev, sizeof(ev), match.sk);
+
+ if (match.sk)
+ sock_put(match.sk);
+
+ return err;
+}
+
int mgmt_set_local_name_complete(struct hci_dev *hdev, u8 *name, u8 status)
{
struct pending_cmd *cmd;
--
1.7.9
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 2/4] Bluetooth: mgmt: Add support for Set Link Security command
2012-02-16 23:22 ` [PATCH 2/4] Bluetooth: mgmt: Add support for Set Link Security command johan.hedberg
@ 2012-02-16 23:39 ` Johan Hedberg
2012-02-17 8:33 ` Marcel Holtmann
1 sibling, 0 replies; 9+ messages in thread
From: Johan Hedberg @ 2012-02-16 23:39 UTC (permalink / raw)
To: linux-bluetooth
Hi,
On Fri, Feb 17, 2012, johan.hedberg@gmail.com wrote:
> + hdev = hci_dev_get(index);
> + if (!hdev)
> + return cmd_status(sk, index, MGMT_OP_SET_LINK_SECURITY,
> + MGMT_STATUS_INVALID_PARAMS);
> +
> + hci_dev_lock(hdev);
> +
> + if (mgmt_pending_find(MGMT_OP_SET_LINK_SECURITY, hdev)) {
> + err = cmd_status(sk, index, MGMT_OP_SET_LINK_SECURITY,
> + MGMT_STATUS_BUSY);
> + goto failed;
> + }
> +
> + val = !!cp->val;
> +
> + if (test_bit(HCI_AUTH, &hdev->flags) == val) {
> + err = send_settings_rsp(sk, MGMT_OP_SET_LINK_SECURITY, hdev);
> + goto failed;
> + }
> +
> + cmd = mgmt_pending_add(sk, MGMT_OP_SET_LINK_SECURITY, hdev, data, len);
> + if (!cmd) {
> + err = -ENOMEM;
> + goto failed;
> + }
> +
> + err = hci_send_cmd(hdev, HCI_OP_WRITE_AUTH_ENABLE, sizeof(val), &val);
> + if (err < 0) {
> + mgmt_pending_remove(cmd);
> + goto failed;
> + }
There's a missing check for HCI_UP here as well as in the corresponding
place of patch 3/4. I'll send v2's of 2/4 and 3/4 as a new patch-set
(1/4 and 4/4 are quite trivial so I wont bother resending them).
Johan
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 2/4] Bluetooth: mgmt: Add support for Set Link Security command
2012-02-16 23:22 ` [PATCH 2/4] Bluetooth: mgmt: Add support for Set Link Security command johan.hedberg
2012-02-16 23:39 ` Johan Hedberg
@ 2012-02-17 8:33 ` Marcel Holtmann
1 sibling, 0 replies; 9+ messages in thread
From: Marcel Holtmann @ 2012-02-17 8:33 UTC (permalink / raw)
To: johan.hedberg; +Cc: linux-bluetooth
Hi Johan,
> The Set Link Security mgmt command is used to enable or disable link
> level security, also known as Security Mode 3. This is rarely enabled in
> modern systems but the command needs to be available for completeness,
> qualification purposes and those few systems that actually want to
> enable it.
>
> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
> ---
> include/net/bluetooth/hci_core.h | 1 +
> net/bluetooth/hci_event.c | 3 +
> net/bluetooth/mgmt.c | 81 ++++++++++++++++++++++++++++++++++++++
> 3 files changed, 85 insertions(+), 0 deletions(-)
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Regards
Marcel
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 3/4] Bluetooth: mgmt: Implement Set SSP command
2012-02-16 23:22 [PATCH 1/4] Bluetooth: Remove unused member from cmd_lookup struct johan.hedberg
2012-02-16 23:22 ` [PATCH 2/4] Bluetooth: mgmt: Add support for Set Link Security command johan.hedberg
@ 2012-02-16 23:22 ` johan.hedberg
2012-02-17 8:33 ` Marcel Holtmann
2012-02-16 23:22 ` [PATCH 4/4] Bluetooth: mgmt: Use more consistent error variable names johan.hedberg
2012-02-17 8:33 ` [PATCH 1/4] Bluetooth: Remove unused member from cmd_lookup struct Marcel Holtmann
3 siblings, 1 reply; 9+ messages in thread
From: johan.hedberg @ 2012-02-16 23:22 UTC (permalink / raw)
To: linux-bluetooth
From: Johan Hedberg <johan.hedberg@intel.com>
The Set SSP mgmt command can be used for enabling and disabling Secure
Simple Pairing support for controllers that support it.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---
include/net/bluetooth/hci_core.h | 1 +
net/bluetooth/hci_event.c | 6 ++-
net/bluetooth/mgmt.c | 79 ++++++++++++++++++++++++++++++++++++++
3 files changed, 85 insertions(+), 1 deletions(-)
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 66f84ad..43e0b1e 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -995,6 +995,7 @@ int mgmt_user_passkey_neg_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr,
int mgmt_auth_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
u8 addr_type, u8 status);
int mgmt_auth_enable_complete(struct hci_dev *hdev, u8 status);
+int mgmt_ssp_enable_complete(struct hci_dev *hdev, u8 status);
int mgmt_set_local_name_complete(struct hci_dev *hdev, u8 *name, u8 status);
int mgmt_read_local_oob_data_reply_complete(struct hci_dev *hdev, u8 *hash,
u8 *randomizer, u8 status);
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 239e9fb..179d127 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -447,7 +447,7 @@ static void hci_cc_write_ssp_mode(struct hci_dev *hdev, struct sk_buff *skb)
BT_DBG("%s status 0x%x", hdev->name, status);
if (status)
- return;
+ goto done;
sent = hci_sent_cmd_data(hdev, HCI_OP_WRITE_SSP_MODE);
if (!sent)
@@ -457,6 +457,10 @@ static void hci_cc_write_ssp_mode(struct hci_dev *hdev, struct sk_buff *skb)
set_bit(HCI_SSP_ENABLED, &hdev->dev_flags);
else
clear_bit(HCI_SSP_ENABLED, &hdev->dev_flags);
+
+done:
+ if (test_bit(HCI_MGMT, &hdev->dev_flags))
+ mgmt_ssp_enable_complete(hdev, status);
}
static u8 hci_get_inquiry_mode(struct hci_dev *hdev)
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index e38b3cb..ecfb747 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1017,6 +1017,58 @@ failed:
return err;
}
+static int set_ssp(struct sock *sk, u16 index, void *data, u16 len)
+{
+ struct mgmt_mode *cp = data;
+ struct pending_cmd *cmd;
+ struct hci_dev *hdev;
+ uint8_t val;
+ int err;
+
+ BT_DBG("request for hci%u", index);
+
+ if (len != sizeof(*cp))
+ return cmd_status(sk, index, MGMT_OP_SET_SSP,
+ MGMT_STATUS_INVALID_PARAMS);
+
+ hdev = hci_dev_get(index);
+ if (!hdev)
+ return cmd_status(sk, index, MGMT_OP_SET_SSP,
+ MGMT_STATUS_INVALID_PARAMS);
+
+ hci_dev_lock(hdev);
+
+ if (mgmt_pending_find(MGMT_OP_SET_SSP, hdev)) {
+ err = cmd_status(sk, index, MGMT_OP_SET_SSP, MGMT_STATUS_BUSY);
+ goto failed;
+ }
+
+ val = !!cp->val;
+
+ if (test_bit(HCI_SSP_ENABLED, &hdev->dev_flags) == val) {
+ err = send_settings_rsp(sk, MGMT_OP_SET_SSP, hdev);
+ goto failed;
+ }
+
+ cmd = mgmt_pending_add(sk, MGMT_OP_SET_SSP, hdev, data, len);
+ if (!cmd) {
+ err = -ENOMEM;
+ goto failed;
+ }
+
+ err = hci_send_cmd(hdev, HCI_OP_WRITE_SSP_MODE, sizeof(val), &val);
+ if (err < 0) {
+ mgmt_pending_remove(cmd);
+ goto failed;
+ }
+
+failed:
+ hci_dev_unlock(hdev);
+ hci_dev_put(hdev);
+
+ return err;
+}
+
static int add_uuid(struct sock *sk, u16 index, void *data, u16 len)
{
struct mgmt_cp_add_uuid *cp = data;
@@ -2499,6 +2551,9 @@ int mgmt_control(struct sock *sk, struct msghdr *msg, size_t msglen)
case MGMT_OP_SET_LINK_SECURITY:
err = set_link_security(sk, index, cp, len);
break;
+ case MGMT_OP_SET_SSP:
+ err = set_ssp(sk, index, cp, len);
+ break;
case MGMT_OP_ADD_UUID:
err = add_uuid(sk, index, cp, len);
break;
@@ -3046,6 +3101,30 @@ int mgmt_auth_enable_complete(struct hci_dev *hdev, u8 status)
return err;
}
+int mgmt_ssp_enable_complete(struct hci_dev *hdev, u8 status)
+{
+ struct cmd_lookup match = { NULL, hdev };
+ __le32 ev;
+ int err;
+
+ if (status) {
+ u8 mgmt_err = mgmt_status(status);
+ mgmt_pending_foreach(MGMT_OP_SET_SSP, hdev,
+ cmd_status_rsp, &mgmt_err);
+ return 0;
+ }
+
+ mgmt_pending_foreach(MGMT_OP_SET_SSP, hdev, settings_rsp, &match);
+
+ ev = cpu_to_le32(get_current_settings(hdev));
+ err = mgmt_event(MGMT_EV_NEW_SETTINGS, hdev, &ev, sizeof(ev), match.sk);
+
+ if (match.sk)
+ sock_put(match.sk);
+
+ return err;
+}
+
int mgmt_set_local_name_complete(struct hci_dev *hdev, u8 *name, u8 status)
{
struct pending_cmd *cmd;
--
1.7.9
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 4/4] Bluetooth: mgmt: Use more consistent error variable names
2012-02-16 23:22 [PATCH 1/4] Bluetooth: Remove unused member from cmd_lookup struct johan.hedberg
2012-02-16 23:22 ` [PATCH 2/4] Bluetooth: mgmt: Add support for Set Link Security command johan.hedberg
2012-02-16 23:22 ` [PATCH 3/4] Bluetooth: mgmt: Implement Set SSP command johan.hedberg
@ 2012-02-16 23:22 ` johan.hedberg
2012-02-17 8:33 ` Marcel Holtmann
2012-02-17 8:33 ` [PATCH 1/4] Bluetooth: Remove unused member from cmd_lookup struct Marcel Holtmann
3 siblings, 1 reply; 9+ messages in thread
From: johan.hedberg @ 2012-02-16 23:22 UTC (permalink / raw)
To: linux-bluetooth
From: Johan Hedberg <johan.hedberg@intel.com>
For simple integer errors the variable name "err" is more consistent
with the existing code base than "ret".
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---
net/bluetooth/mgmt.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index ecfb747..86a7a5c 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -2696,7 +2696,7 @@ int mgmt_powered(struct hci_dev *hdev, u8 powered)
{
struct cmd_lookup match = { NULL, hdev };
__le32 ev;
- int ret;
+ int err;
mgmt_pending_foreach(MGMT_OP_SET_POWERED, hdev, settings_rsp, &match);
@@ -2707,50 +2707,50 @@ int mgmt_powered(struct hci_dev *hdev, u8 powered)
ev = cpu_to_le32(get_current_settings(hdev));
- ret = mgmt_event(MGMT_EV_NEW_SETTINGS, hdev, &ev, sizeof(ev),
+ err = mgmt_event(MGMT_EV_NEW_SETTINGS, hdev, &ev, sizeof(ev),
match.sk);
if (match.sk)
sock_put(match.sk);
- return ret;
+ return err;
}
int mgmt_discoverable(struct hci_dev *hdev, u8 discoverable)
{
struct cmd_lookup match = { NULL, hdev };
__le32 ev;
- int ret;
+ int err;
mgmt_pending_foreach(MGMT_OP_SET_DISCOVERABLE, hdev, settings_rsp, &match);
ev = cpu_to_le32(get_current_settings(hdev));
- ret = mgmt_event(MGMT_EV_NEW_SETTINGS, hdev, &ev, sizeof(ev),
+ err = mgmt_event(MGMT_EV_NEW_SETTINGS, hdev, &ev, sizeof(ev),
match.sk);
if (match.sk)
sock_put(match.sk);
- return ret;
+ return err;
}
int mgmt_connectable(struct hci_dev *hdev, u8 connectable)
{
__le32 ev;
struct cmd_lookup match = { NULL, hdev };
- int ret;
+ int err;
mgmt_pending_foreach(MGMT_OP_SET_CONNECTABLE, hdev, settings_rsp,
&match);
ev = cpu_to_le32(get_current_settings(hdev));
- ret = mgmt_event(MGMT_EV_NEW_SETTINGS, hdev, &ev, sizeof(ev), match.sk);
+ err = mgmt_event(MGMT_EV_NEW_SETTINGS, hdev, &ev, sizeof(ev), match.sk);
if (match.sk)
sock_put(match.sk);
- return ret;
+ return err;
}
int mgmt_write_scan_failed(struct hci_dev *hdev, u8 scan, u8 status)
--
1.7.9
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 1/4] Bluetooth: Remove unused member from cmd_lookup struct
2012-02-16 23:22 [PATCH 1/4] Bluetooth: Remove unused member from cmd_lookup struct johan.hedberg
` (2 preceding siblings ...)
2012-02-16 23:22 ` [PATCH 4/4] Bluetooth: mgmt: Use more consistent error variable names johan.hedberg
@ 2012-02-17 8:33 ` Marcel Holtmann
3 siblings, 0 replies; 9+ messages in thread
From: Marcel Holtmann @ 2012-02-17 8:33 UTC (permalink / raw)
To: johan.hedberg; +Cc: linux-bluetooth
Hi Johan,
> The val member of cmd_lookup isn't used anywhere so it can be removed.
>
> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
> ---
> net/bluetooth/mgmt.c | 7 +++----
> 1 files changed, 3 insertions(+), 4 deletions(-)
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Regards
Marcel
^ permalink raw reply [flat|nested] 9+ messages in thread