Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfd9dcb3 authored by Guillaume Bertholon's avatar Guillaume Bertholon Committed by Greg Kroah-Hartman
Browse files

Bluetooth: MGMT: Fix misplaced BT_HS check 



The upstream commit b560a208cda0 ("Bluetooth: MGMT: Fix not checking if
BT_HS is enabled") inserted a new check in the `set_hs` function.
However, its backported version in stable (commit 5abe9f99
("Bluetooth: MGMT: Fix not checking if BT_HS is enabled")),
added the check in `set_link_security` instead.

This patch restores the intent of the upstream commit by moving back the
BT_HS check to `set_hs`.

Fixes: 5abe9f99 ("Bluetooth: MGMT: Fix not checking if BT_HS is enabled")
Signed-off-by: default avatarGuillaume Bertholon <guillaume.bertholon@ens.fr>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 07cf4e8d

net/bluetooth/mgmt.c

+4 −4
Original line number Diff line number Diff line
@@ -2285,10 +2285,6 @@ static int set_link_security(struct sock *sk, struct hci_dev *hdev, void *data, 


	BT_DBG("request for %s", hdev->name);



	if (!IS_ENABLED(CONFIG_BT_HS))

		return mgmt_cmd_status(sk, hdev->id, MGMT_OP_SET_HS,

				       MGMT_STATUS_NOT_SUPPORTED);



	status = mgmt_bredr_support(hdev);

	if (status)

		return mgmt_cmd_status(sk, hdev->id, MGMT_OP_SET_LINK_SECURITY,
@@ -2438,6 +2434,10 @@ static int set_hs(struct sock *sk, struct hci_dev *hdev, void *data, u16 len) 


	BT_DBG("request for %s", hdev->name);



	if (!IS_ENABLED(CONFIG_BT_HS))

		return mgmt_cmd_status(sk, hdev->id, MGMT_OP_SET_HS,

				       MGMT_STATUS_NOT_SUPPORTED);



	status = mgmt_bredr_support(hdev);

	if (status)

		return mgmt_cmd_status(sk, hdev->id, MGMT_OP_SET_HS, status);