bluetooth: don't DMA to stack in btsdio driver
PATCH 1/1 bluetooth: don't DMA to stack in btsdio driver
sdio_read() may use DMA so read the Type-A header into a kmalloc'd buffer instead of an on-stack buffer (which results in a DMA API warning).
--- drivers/bluetooth/btsdio.c | 34 +++++++++++++++++++++------------- 1 files changed, 21 insertions(+), 13 deletions(-)
drivers/bluetooth/btsdio.c +21 -13
@@ -54,6 +54,7 @@ MODULE_DEVICE_TABLE(sdio, btsdio_table);struct btsdio_data {struct hci_dev *hdev;struct sdio_func *func; +u8 *hdr_buf;struct work_struct work;
@@ -122,7 +123,7 @@ static void btsdio_work(struct work_struct *work)static int btsdio_rx_packet (struct btsdio_data *data) { - u8 hdr[4] __attribute__ ((aligned(4))); +u8 *hdr = data->hdr_buf;struct sk_buff *skb;int err, len;
@@ -299,9 +300,9 @@ static int btsdio_probe(struct sdio_func *func, const struct sdio_device_id *id) {struct btsdio_data *data; -struct hci_dev *hdev; +struct hci_dev *hdev =NULL ;struct sdio_func_tuple *tuple = func->tuples; -int err; +int err = -ENOMEM ;BT_DBG ("func %p id %p class 0x%04x" , func, id, func->class);
@@ -312,7 +313,11 @@ static int btsdio_probe(struct sdio_func *func, data =kzalloc (sizeof (*data),GFP_KERNEL );if (!data) -return -ENOMEM ; + goto error; + + data->hdr_buf =kmalloc (4 ,GFP_KERNEL ); +if (!data->hdr_buf) + goto error; data->func = func;
@@ -321,10 +326,8 @@ static int btsdio_probe(struct sdio_func *func,skb_queue_head_init (&data->txq); hdev =hci_alloc_dev (); -if (!hdev) { -kfree (data); -return -ENOMEM ; - } +if (!hdev) + goto error; hdev->type =HCI_SDIO ; hdev->driver_data = data;
@@ -342,15 +345,20 @@ static int btsdio_probe(struct sdio_func *func, hdev->owner =THIS_MODULE ; err =hci_register_dev (hdev); -if (err <0 ) { -hci_free_dev (hdev); -kfree (data); -return err; - } +if (err <0 ) + goto error;sdio_set_drvdata (func, data);return 0 ; +error: +if (data) { +if (hdev) +hci_free_dev (hdev); +kfree (data->hdr_buf); +kfree (data); + } +return err; }static void btsdio_remove (struct sdio_func *func)
Signature · 1 line
1.6.3.3
PATCH 1/1 bluetooth: don't DMA to stack in btsdio driver
sdio_read() may use DMA so read the Type-A header into a kmalloc'd buffer instead of an on-stack buffer (which results in a DMA API warning).
---
Apply this instead, it frees the header buffer.
David
drivers/bluetooth/btsdio.c | 35 ++++++++++++++++++++++------------- 1 files changed, 22 insertions(+), 13 deletions(-)
drivers/bluetooth/btsdio.c +22 -13
@@ -54,6 +54,7 @@ MODULE_DEVICE_TABLE(sdio, btsdio_table);struct btsdio_data {struct hci_dev *hdev;struct sdio_func *func; +u8 *hdr_buf;struct work_struct work;
@@ -122,7 +123,7 @@ static void btsdio_work(struct work_struct *work)static int btsdio_rx_packet (struct btsdio_data *data) { - u8 hdr[4] __attribute__ ((aligned(4))); +u8 *hdr = data->hdr_buf;struct sk_buff *skb;int err, len;
@@ -292,6 +293,7 @@ static void btsdio_destruct(struct hci_dev *hdev)BT_DBG ("%s" , hdev->name); +kfree (data->hdr_buf);kfree (data); }
@@ -299,9 +301,9 @@ static int btsdio_probe(struct sdio_func *func, const struct sdio_device_id *id) {struct btsdio_data *data; -struct hci_dev *hdev; +struct hci_dev *hdev =NULL ;struct sdio_func_tuple *tuple = func->tuples; -int err; +int err = -ENOMEM ;BT_DBG ("func %p id %p class 0x%04x" , func, id, func->class);
@@ -312,7 +314,11 @@ static int btsdio_probe(struct sdio_func *func, data =kzalloc (sizeof (*data),GFP_KERNEL );if (!data) -return -ENOMEM ; + goto error; + + data->hdr_buf =kmalloc (4 ,GFP_KERNEL ); +if (!data->hdr_buf) + goto error; data->func = func;
@@ -321,10 +327,8 @@ static int btsdio_probe(struct sdio_func *func,skb_queue_head_init (&data->txq); hdev =hci_alloc_dev (); -if (!hdev) { -kfree (data); -return -ENOMEM ; - } +if (!hdev) + goto error; hdev->type =HCI_SDIO ; hdev->driver_data = data;
@@ -342,15 +346,20 @@ static int btsdio_probe(struct sdio_func *func, hdev->owner =THIS_MODULE ; err =hci_register_dev (hdev); -if (err <0 ) { -hci_free_dev (hdev); -kfree (data); -return err; - } +if (err <0 ) + goto error;sdio_set_drvdata (func, data);return 0 ; +error: +if (data) { +if (hdev) +hci_free_dev (hdev); +kfree (data->hdr_buf); +kfree (data); + } +return err; }static void btsdio_remove (struct sdio_func *func)
Signature · 1 line
1.6.3.3
Quoted 11 lines · David Vrabel
sdio_read()may use DMA so read the Type-A header into a kmalloc'd buffer instead of an on-stack buffer (which results in a DMA API warning).Signed-off-by David Vrabel <[email protected]>---
Apply this instead, it frees the header buffer.David
=C2=A0drivers/bluetooth/btsdio.c | =C2=A0 35 ++++++++++++++++++++++------=
-------
Quoted 32 lines
=C2=A01 files changed, 22 insertions(+), 13 deletions(-)
drivers/bluetooth/btsdio.c +3
-1@@ -54,6 +54,7 @@ MODULE_DEVICE_TABLE(sdio, btsdio_table); =C2=A0struct btsdio_data { =C2=A0 =C2=A0 =C2=A0 =C2=A0struct hci_dev =C2=A0 *hdev; =C2=A0 =C2=A0 =C2=A0 =C2=A0struct sdio_func *func; + =C2=A0 =C2=A0 =C2=A0 u8 *hdr_buf; =C2=A0 =C2=A0 =C2=A0 =C2=A0struct work_struct work;@@ -122,7 +123,7 @@ static void btsdio_work(struct work_struct *work) =C2=A0static int btsdio_rx_packet(struct btsdio_data *data) =C2=A0{ - =C2=A0 =C2=A0 =C2=A0 u8 hdr[4] __attribute__ ((aligned(4))); + =C2=A0 =C2=A0 =C2=A0 u8 *hdr =3D data->hdr_buf; =C2=A0 =C2=A0 =C2=A0 =C2=A0struct sk_buff *skb; =C2=A0 =C2=A0 =C2=A0 =C2=A0int err, len;@@ -292,6 +293,7 @@ static void btsdio_destruct(struct hci_dev *hdev) =C2 =A0 =C2 =A0 =C2 =A0 =C2 =A0BT_DBG ("%s" , hdev->name); + =C2=A0 =C2=A0 =C2=A0 kfree(data->hdr_buf); =C2=A0 =C2=A0 =C2=A0 =C2=A0kfree(data); =C2=A0}@@ -299,9 +301,9 @@ static int btsdio_probe(struct sdio_func *func,
Quoted 1 line
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0const struct sdio_device_id *id)
Quoted 4 lines
=C2=A0{
=C2=A0 =C2=A0 =C2=A0 =C2=A0structbtsdio_data*data;
- =C2=A0 =C2=A0 =C2=A0 structhci_dev*hdev;
+ =C2=A0 =C2=A0 =C2=A0 structhci_dev*hdev =3D NULL;
This kind of assignments prevent useful warning from compiler, maybe it's better to stage
the error bailout.
Quoted 1 line
=C2=A0 =C2=A0 =C2=A0 =C2=A0struct
sdio_func_tuple*tuple =3D func->tuples=
;
Quoted 2 lines
- =C2=A0 =C2=A0 =C2=A0 int err;
+ =C2=A0 =C2=A0 =C2=A0 int err =3D-ENOMEM;
You are assuming no other code between 2 allocations, it's seems to me error prone.
Quoted 1 line
Thanks
Tomas
Quoted 11 lines · Tomas Winkler
drivers/bluetooth/btsdio.c static int btsdio_probe(struct sdio_func *func, · line 304
Quoted 7 lines
drivers/bluetooth/btsdio.c +1
-1@@ -299,9 +301,9 @@ static int btsdio_probe(struct sdio_func *func, const struct sdio_device_id *id) {struct btsdio_data *data; -struct hci_dev *hdev; +struct hci_dev *hdev =NULL ;This kind of assignments prevent useful warning from compiler, maybe it's better to stage
the error bailout.
I think that having to have an error_foo label for each error makes writing error handling harder not easier. I'm not inclined to change this, particular as I can't think of any "useful warnings" are prevented.
Quoted 5 lines
drivers/bluetooth/btsdio.c static int btsdio_probe(struct sdio_func *func, · line 306
Quoted 3 lines
drivers/bluetooth/btsdio.c +1
-1struct sdio_func_tuple *tuple = func->tuples; -int err; +int err = -ENOMEM ;You are assuming no other code between 2 allocations, it's seems to me error prone.
Yeah, it's probably best to set err at the source of the error. This code is so short it doesn't make any real practical difference. I'll keep it in mind for the future though.
David
Signature · 6 lines
David Vrabel, Senior Software Engineer, Drivers CSR, Churchill House, Cambridge Business Park, Tel: +44 (0)1223 692562 Cowley Road, Cambridge, CB4 0WZ http://www.csr.com/ Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom