]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Bluetooth: Prevent transparent SCO on older devices
authorFrédéric Dalleau <frederic.dalleau@linux.intel.com>
Mon, 19 Aug 2013 12:24:01 +0000 (14:24 +0200)
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>
Wed, 21 Aug 2013 14:47:12 +0000 (16:47 +0200)
Older Bluetooth devices may not support Setup Synchronous Connection or
SCO transparent data. This is indicated by the corresponding LMP feature
bits. It is not possible to know if the adapter support these features
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 request BT_VOICE_TRANSPARENT, outgoing
connections fail on connect() and returns -EOPNOTSUPP. Incoming
connections do not fail. However, they should only be allowed depending
on what was specified in Write_Voice_Settings command.

EOPNOTSUPP is choosen because connect() system call is failing after
selecting route but before any connection attempt.

Signed-off-by: Frédéric Dalleau <frederic.dalleau@linux.intel.com>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
net/bluetooth/sco.c

index ed581b41e0346f9279cf494be18057e68aabb200..96bd388d93a4aae145bfb207d26fbc3a90b9e0a8 100644 (file)
@@ -176,6 +176,12 @@ static int sco_connect(struct sock *sk)
        else
                type = SCO_LINK;
 
+       if (sco_pi(sk)->setting == BT_VOICE_TRANSPARENT &&
+           (!lmp_transp_capable(hdev) || !lmp_esco_capable(hdev))) {
+               err = -EOPNOTSUPP;
+               goto done;
+       }
+
        hcon = hci_connect_sco(hdev, type, dst, sco_pi(sk)->setting);
        if (IS_ERR(hcon)) {
                err = PTR_ERR(hcon);