korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-25 21:24:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next

Browse Source 
Johan Hedberg says:

====================
pull request: bluetooth-next 2017-07-01

Here are some more Bluetooth patches for the 4.13 kernel:

 - Added support for Broadcom BCM43430 controllers
 - Added sockaddr length checks before accessing sa_family
 - Fixed possible "might sleep" errors in bnep, cmtp and hidp modules
 - A few other minor fixes

Please let me know if there are any issues pulling. Thanks.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2017-07-01 15:57:29 -07:00
commit 57a53a0b67
10 changed files with 60 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/bluetooth/btbcm.c
View File

@ -295,6 +295,7 @@ static const struct {
{ 0x410e, "BCM43341B0" }, /* 002.001.014 */ { 0x410e, "BCM43341B0" }, /* 002.001.014 */
{ 0x4406, "BCM4324B3" }, /* 002.004.006 */ { 0x4406, "BCM4324B3" }, /* 002.004.006 */
{ 0x610c, "BCM4354" }, /* 003.001.012 */ { 0x610c, "BCM4354" }, /* 003.001.012 */
{ 0x2209, "BCM43430A1" }, /* 001.002.009 */
{ } { }
}; };

12
drivers/bluetooth/hci_bcm.c
View File

@ -419,8 +419,7 @@ finalize:
if (err) if (err)
return err; return err;
err = bcm_request_irq(bcm); if (!bcm_request_irq(bcm))
if (!err)
err = bcm_setup_sleep(hu); err = bcm_setup_sleep(hu);
return err; return err;
@ -657,6 +656,15 @@ static const struct dmi_system_id bcm_wrong_irq_dmi_table[] = {
}, },
.driver_data = &acpi_active_low, .driver_data = &acpi_active_low,
}, },
{
.ident = "Asus T100CHI",
.matches = {
DMI_EXACT_MATCH(DMI_SYS_VENDOR,
"ASUSTeK COMPUTER INC."),
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T100CHI"),
},
.driver_data = &acpi_active_low,
},
{ /* Handle ThinkPad 8 tablets with BCM2E55 chipset ACPI ID */ { /* Handle ThinkPad 8 tablets with BCM2E55 chipset ACPI ID */
.ident = "Lenovo ThinkPad 8", .ident = "Lenovo ThinkPad 8",
.matches = { .matches = {

4
drivers/bluetooth/hci_serdev.c
View File

@ -31,7 +31,7 @@
#include "hci_uart.h" #include "hci_uart.h"
struct serdev_device_ops hci_serdev_client_ops; static struct serdev_device_ops hci_serdev_client_ops;
static inline void hci_uart_tx_complete(struct hci_uart *hu, int pkt_type) static inline void hci_uart_tx_complete(struct hci_uart *hu, int pkt_type)
{ {
@ -268,7 +268,7 @@ static int hci_uart_receive_buf(struct serdev_device *serdev, const u8 *data,
return count; return count;
} }
struct serdev_device_ops hci_serdev_client_ops = { static struct serdev_device_ops hci_serdev_client_ops = {
.receive_buf = hci_uart_receive_buf, .receive_buf = hci_uart_receive_buf,
.write_wakeup = hci_uart_write_wakeup, .write_wakeup = hci_uart_write_wakeup,
}; };

11
net/bluetooth/bnep/core.c
View File

@ -481,16 +481,16 @@ static int bnep_session(void *arg)
struct net_device *dev = s->dev; struct net_device *dev = s->dev;
struct sock *sk = s->sock->sk; struct sock *sk = s->sock->sk;
struct sk_buff *skb; struct sk_buff *skb;
wait_queue_t wait; DEFINE_WAIT_FUNC(wait, woken_wake_function);
BT_DBG(""); BT_DBG("");
set_user_nice(current, -15); set_user_nice(current, -15);
init_waitqueue_entry(&wait, current);
add_wait_queue(sk_sleep(sk), &wait); add_wait_queue(sk_sleep(sk), &wait);
while (1) { while (1) {
set_current_state(TASK_INTERRUPTIBLE); /* Ensure session->terminate is updated */
smp_mb__before_atomic();
if (atomic_read(&s->terminate)) if (atomic_read(&s->terminate))
break; break;
@ -512,9 +512,8 @@ static int bnep_session(void *arg)
break; break;
netif_wake_queue(dev); netif_wake_queue(dev);
schedule(); wait_woken(&wait, TASK_INTERRUPTIBLE, MAX_SCHEDULE_TIMEOUT);
} }
__set_current_state(TASK_RUNNING);
remove_wait_queue(sk_sleep(sk), &wait); remove_wait_queue(sk_sleep(sk), &wait);
/* Cleanup session */ /* Cleanup session */
@ -663,7 +662,7 @@ int bnep_del_connection(struct bnep_conndel_req *req)
s = __bnep_get_session(req->dst); s = __bnep_get_session(req->dst);
if (s) { if (s) {
atomic_inc(&s->terminate); atomic_inc(&s->terminate);
wake_up_process(s->task); wake_up_interruptible(sk_sleep(s->sock->sk));
} else } else
err = -ENOENT; err = -ENOENT;

17
net/bluetooth/cmtp/core.c
View File

@ -280,16 +280,16 @@ static int cmtp_session(void *arg)
struct cmtp_session *session = arg; struct cmtp_session *session = arg;
struct sock *sk = session->sock->sk; struct sock *sk = session->sock->sk;
struct sk_buff *skb; struct sk_buff *skb;
wait_queue_t wait; DEFINE_WAIT_FUNC(wait, woken_wake_function);
BT_DBG("session %p", session); BT_DBG("session %p", session);
set_user_nice(current, -15); set_user_nice(current, -15);
init_waitqueue_entry(&wait, current);
add_wait_queue(sk_sleep(sk), &wait); add_wait_queue(sk_sleep(sk), &wait);
while (1) { while (1) {
set_current_state(TASK_INTERRUPTIBLE); /* Ensure session->terminate is updated */
smp_mb__before_atomic();
if (atomic_read(&session->terminate)) if (atomic_read(&session->terminate))
break; break;
@ -306,9 +306,8 @@ static int cmtp_session(void *arg)
cmtp_process_transmit(session); cmtp_process_transmit(session);
schedule(); wait_woken(&wait, TASK_INTERRUPTIBLE, MAX_SCHEDULE_TIMEOUT);
} }
__set_current_state(TASK_RUNNING);
remove_wait_queue(sk_sleep(sk), &wait); remove_wait_queue(sk_sleep(sk), &wait);
down_write(&cmtp_session_sem); down_write(&cmtp_session_sem);
@ -393,7 +392,7 @@ int cmtp_add_connection(struct cmtp_connadd_req *req, struct socket *sock)
err = cmtp_attach_device(session); err = cmtp_attach_device(session);
if (err < 0) { if (err < 0) {
atomic_inc(&session->terminate); atomic_inc(&session->terminate);
wake_up_process(session->task); wake_up_interruptible(sk_sleep(session->sock->sk));
up_write(&cmtp_session_sem); up_write(&cmtp_session_sem);
return err; return err;
} }
@ -431,7 +430,11 @@ int cmtp_del_connection(struct cmtp_conndel_req *req)
/* Stop session thread */ /* Stop session thread */
atomic_inc(&session->terminate); atomic_inc(&session->terminate);
wake_up_process(session->task);
/* Ensure session->terminate is updated */
smp_mb__after_atomic();
wake_up_interruptible(sk_sleep(session->sock->sk));
} else } else
err = -ENOENT; err = -ENOENT;

7
net/bluetooth/hci_core.c
View File

@ -3096,15 +3096,14 @@ int hci_register_dev(struct hci_dev *hdev)
BT_DBG("%p name %s bus %d", hdev, hdev->name, hdev->bus); BT_DBG("%p name %s bus %d", hdev, hdev->name, hdev->bus);
hdev->workqueue = alloc_workqueue("%s", WQ_HIGHPRI | WQ_UNBOUND | hdev->workqueue = alloc_ordered_workqueue("%s", WQ_HIGHPRI, hdev->name);
WQ_MEM_RECLAIM, 1, hdev->name);
if (!hdev->workqueue) { if (!hdev->workqueue) {
error = -ENOMEM; error = -ENOMEM;
goto err; goto err;
} }
hdev->req_workqueue = alloc_workqueue("%s", WQ_HIGHPRI | WQ_UNBOUND | hdev->req_workqueue = alloc_ordered_workqueue("%s", WQ_HIGHPRI,
WQ_MEM_RECLAIM, 1, hdev->name); hdev->name);
if (!hdev->req_workqueue) { if (!hdev->req_workqueue) {
destroy_workqueue(hdev->workqueue); destroy_workqueue(hdev->workqueue);
error = -ENOMEM; error = -ENOMEM;

33
net/bluetooth/hidp/core.c
View File

@ -36,6 +36,7 @@
#define VERSION "1.2" #define VERSION "1.2"
static DECLARE_RWSEM(hidp_session_sem); static DECLARE_RWSEM(hidp_session_sem);
static DECLARE_WAIT_QUEUE_HEAD(hidp_session_wq);
static LIST_HEAD(hidp_session_list); static LIST_HEAD(hidp_session_list);
static unsigned char hidp_keycode[256] = { static unsigned char hidp_keycode[256] = {
@ -1068,12 +1069,12 @@ static int hidp_session_start_sync(struct hidp_session *session)
* Wake up session thread and notify it to stop. This is asynchronous and * Wake up session thread and notify it to stop. This is asynchronous and
* returns immediately. Call this whenever a runtime error occurs and you want * returns immediately. Call this whenever a runtime error occurs and you want
* the session to stop. * the session to stop.
* Note: wake_up_process() performs any necessary memory-barriers for us. * Note: wake_up_interruptible() performs any necessary memory-barriers for us.
*/ */
static void hidp_session_terminate(struct hidp_session *session) static void hidp_session_terminate(struct hidp_session *session)
{ {
atomic_inc(&session->terminate); atomic_inc(&session->terminate);
wake_up_process(session->task); wake_up_interruptible(&hidp_session_wq);
} }
/* /*
@ -1180,7 +1181,9 @@ static void hidp_session_run(struct hidp_session *session)
struct sock *ctrl_sk = session->ctrl_sock->sk; struct sock *ctrl_sk = session->ctrl_sock->sk;
struct sock *intr_sk = session->intr_sock->sk; struct sock *intr_sk = session->intr_sock->sk;
struct sk_buff *skb; struct sk_buff *skb;
DEFINE_WAIT_FUNC(wait, woken_wake_function);
add_wait_queue(&hidp_session_wq, &wait);
for (;;) { for (;;) {
/* /*
* This thread can be woken up two ways: * This thread can be woken up two ways:
@ -1188,12 +1191,10 @@ static void hidp_session_run(struct hidp_session *session)
* session->terminate flag and wakes this thread up. * session->terminate flag and wakes this thread up.
* - Via modifying the socket state of ctrl/intr_sock. This * - Via modifying the socket state of ctrl/intr_sock. This
* thread is woken up by ->sk_state_changed(). * thread is woken up by ->sk_state_changed().
*
* Note: set_current_state() performs any necessary
* memory-barriers for us.
*/ */
set_current_state(TASK_INTERRUPTIBLE);
/* Ensure session->terminate is updated */
smp_mb__before_atomic();
if (atomic_read(&session->terminate)) if (atomic_read(&session->terminate))
break; break;
@ -1227,11 +1228,22 @@ static void hidp_session_run(struct hidp_session *session)
hidp_process_transmit(session, &session->ctrl_transmit, hidp_process_transmit(session, &session->ctrl_transmit,
session->ctrl_sock); session->ctrl_sock);
schedule(); wait_woken(&wait, TASK_INTERRUPTIBLE, MAX_SCHEDULE_TIMEOUT);
} }
remove_wait_queue(&hidp_session_wq, &wait);
atomic_inc(&session->terminate); atomic_inc(&session->terminate);
set_current_state(TASK_RUNNING);
/* Ensure session->terminate is updated */
smp_mb__after_atomic();
}
static int hidp_session_wake_function(wait_queue_t *wait,
unsigned int mode,
int sync, void *key)
{
wake_up_interruptible(&hidp_session_wq);
return false;
} }
/* /*
@ -1244,7 +1256,8 @@ static void hidp_session_run(struct hidp_session *session)
static int hidp_session_thread(void *arg) static int hidp_session_thread(void *arg)
{ {
struct hidp_session *session = arg; struct hidp_session *session = arg;
wait_queue_t ctrl_wait, intr_wait; DEFINE_WAIT_FUNC(ctrl_wait, hidp_session_wake_function);
DEFINE_WAIT_FUNC(intr_wait, hidp_session_wake_function);
BT_DBG("session %p", session); BT_DBG("session %p", session);
@ -1254,8 +1267,6 @@ static int hidp_session_thread(void *arg)
set_user_nice(current, -15); set_user_nice(current, -15);
hidp_set_timer(session); hidp_set_timer(session);
init_waitqueue_entry(&ctrl_wait, current);
init_waitqueue_entry(&intr_wait, current);
add_wait_queue(sk_sleep(session->ctrl_sock->sk), &ctrl_wait); add_wait_queue(sk_sleep(session->ctrl_sock->sk), &ctrl_wait);
add_wait_queue(sk_sleep(session->intr_sock->sk), &intr_wait); add_wait_queue(sk_sleep(session->intr_sock->sk), &intr_wait);
/* This memory barrier is paired with wq_has_sleeper(). See /* This memory barrier is paired with wq_has_sleeper(). See

5
net/bluetooth/l2cap_sock.c
View File

@ -87,7 +87,8 @@ static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
BT_DBG("sk %p", sk); BT_DBG("sk %p", sk);
if (!addr || addr->sa_family != AF_BLUETOOTH) if (!addr || alen < offsetofend(struct sockaddr, sa_family) ||
addr->sa_family != AF_BLUETOOTH)
return -EINVAL; return -EINVAL;
memset(&la, 0, sizeof(la)); memset(&la, 0, sizeof(la));
@ -181,7 +182,7 @@ static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr,
BT_DBG("sk %p", sk); BT_DBG("sk %p", sk);
if (!addr || alen < sizeof(addr->sa_family) || if (!addr || alen < offsetofend(struct sockaddr, sa_family) ||
addr->sa_family != AF_BLUETOOTH) addr->sa_family != AF_BLUETOOTH)
return -EINVAL; return -EINVAL;

3
net/bluetooth/rfcomm/sock.c
View File

@ -339,7 +339,8 @@ static int rfcomm_sock_bind(struct socket *sock, struct sockaddr *addr, int addr
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
int len, err = 0; int len, err = 0;
if (!addr || addr->sa_family != AF_BLUETOOTH) if (!addr || addr_len < offsetofend(struct sockaddr, sa_family) ||
addr->sa_family != AF_BLUETOOTH)
return -EINVAL; return -EINVAL;
memset(&sa, 0, sizeof(sa)); memset(&sa, 0, sizeof(sa));

6
net/bluetooth/sco.c
View File

@ -524,10 +524,8 @@ static int sco_sock_bind(struct socket *sock, struct sockaddr *addr,
BT_DBG("sk %p %pMR", sk, &sa->sco_bdaddr); BT_DBG("sk %p %pMR", sk, &sa->sco_bdaddr);
if (!addr || addr->sa_family != AF_BLUETOOTH) if (!addr || addr_len < sizeof(struct sockaddr_sco) ||
return -EINVAL; addr->sa_family != AF_BLUETOOTH)
if (addr_len < sizeof(struct sockaddr_sco))
return -EINVAL; return -EINVAL;
lock_sock(sk); lock_sock(sk);