1 files changed, 5 insertions, 2 deletions

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index d756644163bc..6df4af6e99cc 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -850,13 +850,16 @@ static int set_discoverable(struct sock *sk, u16 index, void *data, u16 len)
                 return cmd_status(sk, index, MGMT_OP_SET_DISCOVERABLE,
                                                 MGMT_STATUS_INVALID_PARAMS);
 
+        timeout = get_unaligned_le16(&cp->timeout);
+        if (!cp->val && timeout > 0)
+                return cmd_status(sk, index, MGMT_OP_SET_DISCOVERABLE,
+                                                MGMT_STATUS_INVALID_PARAMS);
+
         hdev = hci_dev_get(index);
         if (!hdev)
                 return cmd_status(sk, index, MGMT_OP_SET_DISCOVERABLE,
                                                 MGMT_STATUS_INVALID_PARAMS);
 
-        timeout = get_unaligned_le16(&cp->timeout);
-
         hci_dev_lock(hdev);
 
         if (!hdev_is_powered(hdev) && timeout > 0) {