From: "Frédéric Dalleau" <frederic.dalleau@linux.intel.com>
To: linux-bluetooth@vger.kernel.org
Cc: "Frédéric Dalleau" <frederic.dalleau@linux.intel.com>
Subject: [PATCH v8 8/8] Bluetooth: Prevent transparent SCO on older devices
Date: Fri, 5 Jul 2013 17:01:42 +0200 [thread overview]
Message-ID: <1373036503-1349-9-git-send-email-frederic.dalleau@linux.intel.com> (raw)
In-Reply-To: <1373036503-1349-1-git-send-email-frederic.dalleau@linux.intel.com>
Older Bluetooth devices may not support Setup Synchronous Connection. This is
indicated by the eSCO support feature bit. It is not possible to know if the
adapter support eSCO before setting BT_VOICE option since the socket is not
bound to an adapter. An adapter can also be added after the socket is created.
The socket can be bound to an address before adapter is plugged in.
Thus, on a such adapters, if user requested something else than
BT_VOICE_CVSD_16BIT, outgoing connections fail on connect() and returns
-ECONNABORTED. Incoming connections do not fail. However, they should only be
allowed depending on what was specified in Write_Voice_Settings command.
Signed-off-by: Frédéric Dalleau <frederic.dalleau@linux.intel.com>
---
net/bluetooth/sco.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 546b7f6..02a602e 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -176,6 +176,11 @@ static int sco_connect(struct sock *sk)
else
type = SCO_LINK;
+ if (type == SCO_LINK && sco_pi(sk)->setting != BT_VOICE_CVSD_16BIT) {
+ err = -ECONNABORTED;
+ goto done;
+ }
+
hcon = hci_connect_sco(hdev, type, dst, sco_pi(sk)->setting);
if (IS_ERR(hcon)) {
err = PTR_ERR(hcon);
--
1.7.9.5
next prev parent reply other threads:[~2013-07-05 15:01 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-05 15:01 [PATCH v8 0/8] sco: SCO socket option for voice_setting Frédéric Dalleau
2013-07-05 15:01 ` [PATCH v8 1/8] Bluetooth: Use hci_connect_sco directly Frédéric Dalleau
2013-07-05 15:01 ` [PATCH v8 2/8] Bluetooth: Remove unused mask parameter in sco_conn_defer_accept Frédéric Dalleau
2013-07-08 19:10 ` Marcel Holtmann
2013-07-09 7:00 ` Frédéric DALLEAU
2013-07-09 7:37 ` Marcel Holtmann
2013-07-05 15:01 ` [PATCH v8 3/8] Bluetooth: Add bluetooth socket voice option Frédéric Dalleau
2013-07-08 19:17 ` Marcel Holtmann
2013-07-05 15:01 ` [PATCH v8 4/8] Bluetooth: Constants declaration for SCO airmode Frédéric Dalleau
2013-07-08 19:04 ` Marcel Holtmann
2013-07-05 15:01 ` [PATCH v8 5/8] Bluetooth: Use voice setting in defered SCO connection request Frédéric Dalleau
2013-07-08 19:12 ` Marcel Holtmann
2013-07-09 9:36 ` Frédéric DALLEAU
2013-07-05 15:01 ` [PATCH v8 6/8] Bluetooth: Parameters for outgoing SCO connections Frédéric Dalleau
2013-07-08 19:20 ` Marcel Holtmann
2013-07-05 15:01 ` [PATCH v8 7/8] Bluetooth: SCO connection fallback Frédéric Dalleau
2013-07-08 19:23 ` Marcel Holtmann
2013-07-09 9:57 ` Frédéric DALLEAU
2013-07-09 14:25 ` Marcel Holtmann
2013-07-05 15:01 ` Frédéric Dalleau [this message]
2013-07-08 2:33 ` [PATCH v8 8/8] Bluetooth: Prevent transparent SCO on older devices Vinicius Costa Gomes
2013-07-08 9:31 ` Frédéric DALLEAU
2013-07-08 19:25 ` Marcel Holtmann
2013-07-12 13:48 ` Frédéric DALLEAU
2013-07-12 16:35 ` Marcel Holtmann
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=1373036503-1349-9-git-send-email-frederic.dalleau@linux.intel.com \
--to=frederic.dalleau@linux.intel.com \
--cc=linux-bluetooth@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).