* [PATCH v3 2/2] Bluetooth: Override status if local user rejects pairing
2012-07-09 10:41 [PATCH v3 1/2] Bluetooth: Refactor PIN code rejection to use user_pairing_resp() Jaganath Kanakkassery
@ 2012-07-09 10:41 ` Jaganath Kanakkassery
2012-07-10 18:28 ` [PATCH v3 1/2] Bluetooth: Refactor PIN code rejection to use user_pairing_resp() Gustavo Padovan
1 sibling, 0 replies; 3+ messages in thread
From: Jaganath Kanakkassery @ 2012-07-09 10:41 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Jaganath Kanakkassery
In case if pairing is failed, user cannot differentiate from the status
whether failure is caused by local rejection or remote rejection
because authentication failure is coming in both the cases.
This patch overrides the status from controller with "Rejected"
in case of local rejection.
This patch will be useful if user can take some action based on local
or remote rejection
Signed-off-by: Jaganath Kanakkassery <jaganath.k@samsung.com>
---
include/net/bluetooth/hci_core.h | 4 +++-
net/bluetooth/hci_event.c | 4 ++--
net/bluetooth/mgmt.c | 22 ++++++++++++++++++++--
net/bluetooth/smp.c | 2 +-
4 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 475b8c0..bbb295f 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -312,6 +312,8 @@ struct hci_conn {
__u16 disc_timeout;
unsigned long flags;
+ bool auth_rejected;
+
__u8 remote_cap;
__u8 remote_auth;
bool flush_key;
@@ -1036,7 +1038,7 @@ int mgmt_user_passkey_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr,
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);
+ u8 addr_type, u8 status, bool auth_rejected);
int mgmt_auth_enable_complete(struct hci_dev *hdev, u8 status);
int mgmt_ssp_enable_complete(struct hci_dev *hdev, u8 enable, u8 status);
int mgmt_set_class_of_dev_complete(struct hci_dev *hdev, u8 *dev_class,
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 1ba929c..d5b4655 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1948,7 +1948,7 @@ static void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
}
} else {
mgmt_auth_failed(hdev, &conn->dst, conn->type, conn->dst_type,
- ev->status);
+ ev->status, conn->auth_rejected);
}
clear_bit(HCI_CONN_AUTH_PEND, &conn->flags);
@@ -3281,7 +3281,7 @@ static void hci_simple_pair_complete_evt(struct hci_dev *hdev,
* the mgmt_auth_failed event */
if (!test_bit(HCI_CONN_AUTH_PEND, &conn->flags) && ev->status != 0)
mgmt_auth_failed(hdev, &conn->dst, conn->type, conn->dst_type,
- ev->status);
+ ev->status, conn->auth_rejected);
hci_conn_put(conn);
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 0475f37..d26994b 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1824,6 +1824,10 @@ static void pairing_complete(struct pending_cmd *cmd, u8 status)
bacpy(&rp.addr.bdaddr, &conn->dst);
rp.addr.type = link_to_bdaddr(conn->type, conn->dst_type);
+ /* Override status if local device rejected pairing */
+ if (status && conn->auth_rejected)
+ status = MGMT_STATUS_REJECTED;
+
cmd_complete(cmd->sk, cmd->index, MGMT_OP_PAIR_DEVICE, status,
&rp, sizeof(rp));
@@ -1832,6 +1836,8 @@ static void pairing_complete(struct pending_cmd *cmd, u8 status)
conn->security_cfm_cb = NULL;
conn->disconn_cfm_cb = NULL;
+ conn->auth_rejected = false;
+
hci_conn_put(conn);
mgmt_pending_remove(cmd);
@@ -2022,6 +2028,13 @@ static int user_pairing_resp(struct sock *sk, struct hci_dev *hdev,
goto done;
}
+ if (hci_op == HCI_OP_USER_CONFIRM_NEG_REPLY ||
+ hci_op == HCI_OP_USER_PASSKEY_NEG_REPLY ||
+ hci_op == HCI_OP_PIN_CODE_NEG_REPLY) {
+ if (find_pairing(conn))
+ conn->auth_rejected = true;
+ }
+
if (type == BDADDR_LE_PUBLIC || type == BDADDR_LE_RANDOM) {
/* Continue with pairing via SMP */
err = smp_user_confirm_reply(conn, mgmt_op, passkey);
@@ -3260,13 +3273,18 @@ 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)
+ u8 addr_type, u8 status, bool auth_rejected)
{
struct mgmt_ev_auth_failed ev;
bacpy(&ev.addr.bdaddr, bdaddr);
ev.addr.type = link_to_bdaddr(link_type, addr_type);
- ev.status = mgmt_status(status);
+
+ /* Override status if local device rejected pairing */
+ if (auth_rejected)
+ ev.status = MGMT_STATUS_REJECTED;
+ else
+ ev.status = mgmt_status(status);
return mgmt_event(MGMT_EV_AUTH_FAILED, hdev, &ev, sizeof(ev), NULL);
}
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 16ef0dc..3c04313 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -265,7 +265,7 @@ static void smp_failure(struct l2cap_conn *conn, u8 reason, u8 send)
clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->hcon->flags);
mgmt_auth_failed(conn->hcon->hdev, conn->dst, hcon->type,
- hcon->dst_type, reason);
+ hcon->dst_type, reason, hcon->auth_rejected);
if (test_and_clear_bit(HCI_CONN_LE_SMP_PEND, &conn->hcon->flags)) {
cancel_delayed_work_sync(&conn->security_timer);
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread