All of lore.kernel.org
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org,
	Luiz Augusto von Dentz <luiz.von.dentz@intel.com>,
	Marcel Holtmann <marcel@holtmann.org>
Subject: [PATCH 5.9 03/15] Bluetooth: MGMT: Fix not checking if BT_HS is enabled
Date: Fri, 16 Oct 2020 11:08:05 +0200	[thread overview]
Message-ID: <20201016090437.338603294@linuxfoundation.org> (raw)
In-Reply-To: <20201016090437.170032996@linuxfoundation.org>

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

commit b560a208cda0297fef6ff85bbfd58a8f0a52a543 upstream.

This checks if BT_HS is enabled relecting it on MGMT_SETTING_HS instead
of always reporting it as supported.

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 net/bluetooth/mgmt.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -782,7 +782,8 @@ static u32 get_supported_settings(struct
 
 		if (lmp_ssp_capable(hdev)) {
 			settings |= MGMT_SETTING_SSP;
-			settings |= MGMT_SETTING_HS;
+			if (IS_ENABLED(CONFIG_BT_HS))
+				settings |= MGMT_SETTING_HS;
 		}
 
 		if (lmp_sc_capable(hdev))
@@ -1815,6 +1816,10 @@ static int set_hs(struct sock *sk, struc
 
 	bt_dev_dbg(hdev, "sock %p", sk);
 
+	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);



  parent reply	other threads:[~2020-10-16  9:12 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-16  9:08 [PATCH 5.9 00/15] 5.9.1-rc1 review Greg Kroah-Hartman
2020-10-16  9:08 ` [PATCH 5.9 01/15] Bluetooth: A2MP: Fix not initializing all members Greg Kroah-Hartman
2020-10-16  9:08 ` [PATCH 5.9 02/15] Bluetooth: L2CAP: Fix calling sk_filter on non-socket based channel Greg Kroah-Hartman
2020-10-16  9:08 ` Greg Kroah-Hartman [this message]
2020-10-16  9:08 ` [PATCH 5.9 04/15] media: usbtv: Fix refcounting mixup Greg Kroah-Hartman
2020-10-16  9:08 ` [PATCH 5.9 05/15] USB: serial: option: add Cellient MPL200 card Greg Kroah-Hartman
2020-10-16  9:08 ` [PATCH 5.9 06/15] USB: serial: option: Add Telit FT980-KS composition Greg Kroah-Hartman
2020-10-16  9:08 ` [PATCH 5.9 07/15] staging: comedi: check validity of wMaxPacketSize of usb endpoints found Greg Kroah-Hartman
2020-10-16  9:08 ` [PATCH 5.9 08/15] USB: serial: pl2303: add device-id for HP GC device Greg Kroah-Hartman
2020-10-16  9:08 ` [PATCH 5.9 09/15] USB: serial: ftdi_sio: add support for FreeCalypso JTAG+UART adapters Greg Kroah-Hartman
2020-10-16  9:08 ` [PATCH 5.9 10/15] vt_ioctl: make VT_RESIZEX behave like VT_RESIZE Greg Kroah-Hartman
2020-10-16  9:08 ` [PATCH 5.9 11/15] reiserfs: Initialize inode keys properly Greg Kroah-Hartman
2020-10-16  9:08 ` [PATCH 5.9 12/15] reiserfs: Fix oops during mount Greg Kroah-Hartman
2020-10-16  9:08 ` [PATCH 5.9 13/15] Revert "drm/amdgpu: Fix NULL dereference in dpm sysfs handlers" Greg Kroah-Hartman
2020-10-16  9:08 ` [PATCH 5.9 14/15] crypto: bcm - Verify GCM/CCM key length in setkey Greg Kroah-Hartman
2020-10-16  9:08 ` [PATCH 5.9 15/15] crypto: qat - check cipher length for aead AES-CBC-HMAC-SHA Greg Kroah-Hartman
2020-10-16 12:21 ` [PATCH 5.9 00/15] 5.9.1-rc1 review Jeffrin Jose T
2020-10-16 16:45 ` Jon Hunter
2020-10-17 11:34   ` Greg Kroah-Hartman
2020-10-16 19:03 ` Naresh Kamboju
2020-10-17 11:34   ` Greg Kroah-Hartman
2020-10-16 21:09 ` Guenter Roeck
2020-10-17 11:34   ` Greg Kroah-Hartman
2020-10-17 16:02 ` Shuah Khan
2020-10-18  6:00   ` Greg Kroah-Hartman
2020-10-19 17:02 ` [tip: perf/urgent] Linux 5.9.1 tip-bot2 for Greg Kroah-Hartman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201016090437.338603294@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luiz.von.dentz@intel.com \
    --cc=marcel@holtmann.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.