Return-Path: From: Andre Guedes To: linux-bluetooth@vger.kernel.org Subject: [PATCH v4 04/14] Bluetooth: Check pending commands in stop_discovery() Date: Mon, 19 Sep 2011 18:35:26 -0300 Message-Id: <1316468136-12472-5-git-send-email-andre.guedes@openbossa.org> In-Reply-To: <1316468136-12472-1-git-send-email-andre.guedes@openbossa.org> References: <1316468136-12472-1-git-send-email-andre.guedes@openbossa.org> Sender: linux-bluetooth-owner@vger.kernel.org List-ID: 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 --- 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 d8333e0..5e1414b 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -1664,6 +1664,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.5.2