Bluetooth: Fix read_name updating when HCI_SETUP is not set
authorJohan Hedberg <johan.hedberg@intel.com>
Wed, 22 Feb 2012 18:14:22 +0000 (20:14 +0200)
committerJohan Hedberg <johan.hedberg@intel.com>
Thu, 23 Feb 2012 11:07:00 +0000 (13:07 +0200)
The local name should only be updated as a consequence of a
hci_read_local_name if we are in the HCI_SETUP state. In all other
scenarios it should only be updated through hci_write_local_name.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
net/bluetooth/hci_event.c

index c79ffb9..9917fe3 100644 (file)
@@ -227,7 +227,8 @@ static void hci_cc_read_local_name(struct hci_dev *hdev, struct sk_buff *skb)
        if (rp->status)
                return;
 
-       memcpy(hdev->dev_name, rp->name, HCI_MAX_NAME_LENGTH);
+       if (test_bit(HCI_SETUP, &hdev->dev_flags))
+               memcpy(hdev->dev_name, rp->name, HCI_MAX_NAME_LENGTH);
 }
 
 static void hci_cc_write_auth_enable(struct hci_dev *hdev, struct sk_buff *skb)