* [PATCH] iwlwifi: re-order module_init order to prevent NULL ptr deref
@ 2012-06-12 19:13 Sasha Levin
2012-06-12 19:17 ` Johannes Berg
0 siblings, 1 reply; 2+ messages in thread
From: Sasha Levin @ 2012-06-12 19:13 UTC (permalink / raw)
To: johannes.berg, wey-yi.w.guy, linville
Cc: ilw, linux-wireless, netdev, linux-kernel, Sasha Levin
We need to make sure iwl_drv_init is called before iwl_init, since otherwise
iwl_init will NULL ptr deref when trying to add a new mode.
Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
---
drivers/net/wireless/iwlwifi/Makefile | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile
index 98c8f64..16e39a4 100644
--- a/drivers/net/wireless/iwlwifi/Makefile
+++ b/drivers/net/wireless/iwlwifi/Makefile
@@ -1,5 +1,3 @@
-obj-$(CONFIG_IWLDVM) += dvm/
-
CFLAGS_iwl-devtrace.o := -I$(src)
# common
@@ -14,4 +12,6 @@ iwlwifi-objs += pcie/1000.o pcie/2000.o pcie/5000.o pcie/6000.o
iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o
+obj-$(CONFIG_IWLDVM) += dvm/
+
ccflags-y += -D__CHECK_ENDIAN__ -I$(src)
--
1.7.8.6
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] iwlwifi: re-order module_init order to prevent NULL ptr deref
2012-06-12 19:13 [PATCH] iwlwifi: re-order module_init order to prevent NULL ptr deref Sasha Levin
@ 2012-06-12 19:17 ` Johannes Berg
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Berg @ 2012-06-12 19:17 UTC (permalink / raw)
To: Sasha Levin
Cc: wey-yi.w.guy, linville, ilw, linux-wireless, netdev, linux-kernel
On Tue, 2012-06-12 at 21:13 +0200, Sasha Levin wrote:
> We need to make sure iwl_drv_init is called before iwl_init, since otherwise
> iwl_init will NULL ptr deref when trying to add a new mode.
>
> Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
> ---
> drivers/net/wireless/iwlwifi/Makefile | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile
> index 98c8f64..16e39a4 100644
> --- a/drivers/net/wireless/iwlwifi/Makefile
> +++ b/drivers/net/wireless/iwlwifi/Makefile
> @@ -1,5 +1,3 @@
> -obj-$(CONFIG_IWLDVM) += dvm/
> -
Thanks! I already have a patch like this in my tree, will send a pull
request soon:
http://git.kernel.org/?p=linux/kernel/git/iwlwifi/iwlwifi-next.git;a=commit;h=4b75b1e49568dd6a30a1dddc47408cc6fde55608
johannes
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-06-12 19:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-12 19:13 [PATCH] iwlwifi: re-order module_init order to prevent NULL ptr deref Sasha Levin
2012-06-12 19:17 ` Johannes Berg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).