Skip to content

Commit

Permalink
Bluetooth: Fix hci core device initialization
Browse files Browse the repository at this point in the history
We must not call device_del() if we didn't use device_add(). See module.c
for comments on that. Therefore, we need to call device_initialize() when
allocating the hci device and later device_add() instead of
device_register().

This also fixes a bug when hci_register_dev() failed and we call
hci_free_dev() without a valid core device. hci_free_dev() segfaults while
calling put_device() on invalid memory.

We already do this with hci_conn connections (hci_conn_init_sysfs()) so
they do not need to be fixed.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
  • Loading branch information
David Herrmann authored and Gustavo F. Padovan committed Oct 14, 2011
1 parent 928abaa commit 0ac7e70
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 6 deletions.
1 change: 1 addition & 0 deletions include/net/bluetooth/hci_core.h
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,7 @@ int hci_recv_frame(struct sk_buff *skb);
int hci_recv_fragment(struct hci_dev *hdev, int type, void *data, int count);
int hci_recv_stream_fragment(struct hci_dev *hdev, void *data, int count);

void hci_init_sysfs(struct hci_dev *hdev);
int hci_register_sysfs(struct hci_dev *hdev);
void hci_unregister_sysfs(struct hci_dev *hdev);
void hci_conn_init_sysfs(struct hci_conn *conn);
Expand Down
1 change: 1 addition & 0 deletions net/bluetooth/hci_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -912,6 +912,7 @@ struct hci_dev *hci_alloc_dev(void)
if (!hdev)
return NULL;

hci_init_sysfs(hdev);
skb_queue_head_init(&hdev->driver_init);

return hdev;
Expand Down
18 changes: 12 additions & 6 deletions net/bluetooth/hci_sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -542,22 +542,28 @@ static int auto_accept_delay_get(void *data, u64 *val)
DEFINE_SIMPLE_ATTRIBUTE(auto_accept_delay_fops, auto_accept_delay_get,
auto_accept_delay_set, "%llu\n");

void hci_init_sysfs(struct hci_dev *hdev)
{
struct device *dev = &hdev->dev;

dev->type = &bt_host;
dev->class = bt_class;

dev_set_drvdata(dev, hdev);
device_initialize(dev);
}

int hci_register_sysfs(struct hci_dev *hdev)
{
struct device *dev = &hdev->dev;
int err;

BT_DBG("%p name %s bus %d", hdev, hdev->name, hdev->bus);

dev->type = &bt_host;
dev->class = bt_class;
dev->parent = hdev->parent;

dev_set_name(dev, "%s", hdev->name);

dev_set_drvdata(dev, hdev);

err = device_register(dev);
err = device_add(dev);
if (err < 0)
return err;

Expand Down

0 comments on commit 0ac7e70

Please sign in to comment.