Bluetooth: hci_ldisc: Use rwlocking to avoid closing proto races

When HCI_UART_PROTO_READY is in the set state, the Data Link protocol
layer (proto) is bound to the HCI UART driver. This state allows the
registered proto function pointers to be used by the HCI UART driver.

When unbinding (closing) the Data Link protocol layer, the proto
function pointers much be prevented from being used immediately before
running the proto close function pointer. Otherwise, there is a risk
that a proto non-close function pointer is used during or after the
proto close function pointer is used. The consequences are likely to
be a kernel crash because the proto close function pointer will free
resources used in the Data Link protocol layer.

Therefore, add a reader writer lock (rwlock) solution to prevent the
close proto function pointer from running by using write_lock_irqsave()
whilst the other proto function pointers are protected using
read_lock(). This means HCI_UART_PROTO_READY can safely be cleared
in the knowledge that no proto function pointers are running.

When flag HCI_UART_PROTO_READY is put into the clear state,
proto close function pointer can safely be run. Note
flag HCI_UART_PROTO_SET being in the set state prevents the proto
open function pointer from being run so there is no race condition
between proto open and close function pointers.

Signed-off-by: Dean Jenkins <Dean_Jenkins@mentor.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index 2edd30556956d83d9087a5b6a78dac198fed6eac..8397b716fa654eb3af0dfd9ab87674aa38f599fa 100644 (file)
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -114,8 +114,12 @@ static inline struct sk_buff *hci_uart_dequeue(struct hci_uart *hu)
        struct sk_buff *skb = hu->tx_skb;
 
        if (!skb) {
+               read_lock(&hu->proto_lock);
+
                if (test_bit(HCI_UART_PROTO_READY, &hu->flags))
                        skb = hu->proto->dequeue(hu);
+
+               read_unlock(&hu->proto_lock);
        } else {
                hu->tx_skb = NULL;
        }
@@ -125,18 +129,23 @@ static inline struct sk_buff *hci_uart_dequeue(struct hci_uart *hu)
 
 int hci_uart_tx_wakeup(struct hci_uart *hu)
 {
+       read_lock(&hu->proto_lock);
+
        if (!test_bit(HCI_UART_PROTO_READY, &hu->flags))
-               return 0;
+               goto no_schedule;
 
        if (test_and_set_bit(HCI_UART_SENDING, &hu->tx_state)) {
                set_bit(HCI_UART_TX_WAKEUP, &hu->tx_state);
-               return 0;
+               goto no_schedule;
        }
 
        BT_DBG("");
 
        schedule_work(&hu->write_work);
 
+no_schedule:
+       read_unlock(&hu->proto_lock);
+
        return 0;
 }
 EXPORT_SYMBOL_GPL(hci_uart_tx_wakeup);
@@ -237,9 +246,13 @@ static int hci_uart_flush(struct hci_dev *hdev)
        tty_ldisc_flush(tty);
        tty_driver_flush_buffer(tty);
 
+       read_lock(&hu->proto_lock);
+
        if (test_bit(HCI_UART_PROTO_READY, &hu->flags))
                hu->proto->flush(hu);
 
+       read_unlock(&hu->proto_lock);
+
        return 0;
 }
 
@@ -261,10 +274,15 @@ static int hci_uart_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
        BT_DBG("%s: type %d len %d", hdev->name, hci_skb_pkt_type(skb),
               skb->len);
 
-       if (!test_bit(HCI_UART_PROTO_READY, &hu->flags))
+       read_lock(&hu->proto_lock);
+
+       if (!test_bit(HCI_UART_PROTO_READY, &hu->flags)) {
+               read_unlock(&hu->proto_lock);
                return -EUNATCH;
+       }
 
        hu->proto->enqueue(hu, skb);
+       read_unlock(&hu->proto_lock);
 
        hci_uart_tx_wakeup(hu);
 
@@ -460,6 +478,8 @@ static int hci_uart_tty_open(struct tty_struct *tty)
        INIT_WORK(&hu->init_ready, hci_uart_init_work);
        INIT_WORK(&hu->write_work, hci_uart_write_work);
 
+       rwlock_init(&hu->proto_lock);
+
        /* Flush any pending characters in the driver */
        tty_driver_flush_buffer(tty);
 
@@ -475,6 +495,7 @@ static void hci_uart_tty_close(struct tty_struct *tty)
 {
        struct hci_uart *hu = tty->disc_data;
        struct hci_dev *hdev;
+       unsigned long flags;
 
        BT_DBG("tty %p", tty);
 
@@ -490,7 +511,11 @@ static void hci_uart_tty_close(struct tty_struct *tty)
 
        cancel_work_sync(&hu->write_work);
 
-       if (test_and_clear_bit(HCI_UART_PROTO_READY, &hu->flags)) {
+       if (test_bit(HCI_UART_PROTO_READY, &hu->flags)) {
+               write_lock_irqsave(&hu->proto_lock, flags);
+               clear_bit(HCI_UART_PROTO_READY, &hu->flags);
+               write_unlock_irqrestore(&hu->proto_lock, flags);
+
                if (hdev) {
                        if (test_bit(HCI_UART_REGISTERED, &hu->flags))
                                hci_unregister_dev(hdev);
@@ -549,13 +574,18 @@ static void hci_uart_tty_receive(struct tty_struct *tty, const u8 *data,
        if (!hu || tty != hu->tty)
                return;
 
-       if (!test_bit(HCI_UART_PROTO_READY, &hu->flags))
+       read_lock(&hu->proto_lock);
+
+       if (!test_bit(HCI_UART_PROTO_READY, &hu->flags)) {
+               read_unlock(&hu->proto_lock);
                return;
+       }
 
        /* It does not need a lock here as it is already protected by a mutex in
         * tty caller
         */
        hu->proto->recv(hu, data, count);
+       read_unlock(&hu->proto_lock);
 
        if (hu->hdev)
                hu->hdev->stat.byte_rx += count;

diff --git a/drivers/bluetooth/hci_uart.h b/drivers/bluetooth/hci_uart.h
index 2b05e557fad01ef9ea0177f78ba5ef15850f4016..c6e9e1cf63f886698d4bde03d510171fc62174f5 100644 (file)
--- a/drivers/bluetooth/hci_uart.h
+++ b/drivers/bluetooth/hci_uart.h
@@ -87,6 +87,7 @@ struct hci_uart {
        struct work_struct      write_work;
 
        const struct hci_uart_proto *proto;
+       rwlock_t                proto_lock;     /* Stop work for proto close */
        void                    *priv;
 
        struct sk_buff          *tx_skb;