[PATCH v2 05/16] Bluetooth: Check pending commands in stop_discovery()
From: Andre Guedes <hidden>
Date: 2011-07-25 19:49:54
Subsystem:
bluetooth subsystem, the rest · Maintainers:
Marcel Holtmann, Luiz Augusto von Dentz, Linus Torvalds
This patch adds extra checks in stop_discovery(). The MGMT_OP_STOP_DISCOVERY command should be executed if the device is running the discovery procedure. So, if there is no discovery procedure running then EINVAL command status should be returned. Also, if a MGMT_OP_STOP_DISCOVERY command has been already issued then EINPROGRESS command status should returned. Signed-off-by: Andre Guedes <redacted> --- net/bluetooth/mgmt.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 83693ac..d673ea3 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c@@ -1674,6 +1674,17 @@ static int stop_discovery(struct sock *sk, u16 index) hci_dev_lock_bh(hdev); + if (!mgmt_pending_find(MGMT_OP_START_DISCOVERY, index)) { + err = cmd_status(sk, index, MGMT_OP_STOP_DISCOVERY, EINVAL); + goto failed; + } + + if (mgmt_pending_find(MGMT_OP_STOP_DISCOVERY, index)) { + err = cmd_status(sk, index, MGMT_OP_STOP_DISCOVERY, + EINPROGRESS); + goto failed; + } + cmd = mgmt_pending_add(sk, MGMT_OP_STOP_DISCOVERY, index, NULL, 0); if (!cmd) { err = -ENOMEM;
--
1.7.4.1