From: Anatol Pomozov Date: Wed, 30 Jul 2014 22:57:03 +0000 (-0700) Subject: Bluetooth: Fix crash in the Marvell driver initialization codepath X-Git-Tag: v3.16.35~3473 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a7b256527e348c69530cabfcb2031d9fd74e4586;p=thirdparty%2Fkernel%2Fstable.git Bluetooth: Fix crash in the Marvell driver initialization codepath commit 8500d791c458ccbbb3e2d3fa9a0320ffd5729069 upstream. 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 Signed-off-by: Marcel Holtmann Signed-off-by: Luis Henriques --- diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c index 3ecba5c979bd1..ae0b48471ffc9 100644 --- a/drivers/bluetooth/btmrvl_main.c +++ b/drivers/bluetooth/btmrvl_main.c @@ -667,12 +667,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);