2014-07-30 22:57:03

by Anatol Pomozov

Subject: [PATCH] bluetooth: Fix crash in the driver initialization codepath

btmrvl_add_card() function calls kthread_run that might return error
(e.g. if current thread is killed). If one tries to use the error
value as a pointer then invalid memory access oops happens.

Check kthread_run() return value, if it is an error then release resources correctly.

TEST=boot computer with BT modules enabled. I see the error message that BT device
initialization failed. Now kernel does not crash. Hint: to enable BT run
'rmmod btmrvl_sdio; modprobe btmrvl_sdio'

Signed-off-by: Anatol Pomozov <[email protected]>
---
drivers/bluetooth/btmrvl_main.c | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c
index e9dbddb..d95ebf6 100644
--- a/drivers/bluetooth/btmrvl_main.c
+++ b/drivers/bluetooth/btmrvl_main.c
@@ -645,12 +645,17 @@ struct btmrvl_private *btmrvl_add_card(void *card)
init_waitqueue_head(&priv->main_thread.wait_q);
priv->main_thread.task = kthread_run(btmrvl_service_main_thread,
&priv->main_thread, "btmrvl_main_service");
+ if (IS_ERR(priv->main_thread.task))
+ goto err_thread;

priv->btmrvl_dev.card = card;
priv->btmrvl_dev.tx_dnld_rdy = true;

return priv;

+err_thread:
+ btmrvl_free_adapter(priv);
+
err_adapter:
kfree(priv);

--
2.0.0.526.g5318336

2014-07-30 23:10:04

by Marcel Holtmann

Subject: Re: [PATCH] bluetooth: Fix crash in the driver initialization codepath

Hi Anatol,

> btmrvl_add_card() function calls kthread_run that might return error
> (e.g. if current thread is killed). If one tries to use the error
> value as a pointer then invalid memory access oops happens.
>
> Check kthread_run() return value, if it is an error then release resources correctly.
>
> TEST=boot computer with BT modules enabled. I see the error message that BT device
> initialization failed. Now kernel does not crash. Hint: to enable BT run
> 'rmmod btmrvl_sdio; modprobe btmrvl_sdio'
>
> Signed-off-by: Anatol Pomozov <[email protected]>
> ---
> drivers/bluetooth/btmrvl_main.c | 5 +++++
> 1 file changed, 5 insertions(+)

patch has been applied to bluetooth-next tree.

Regards

Marcel