* pull request: wireless-2.6 'fixes' 2008-01-22
@ 2008-01-23 1:44 John W. Linville
2008-01-23 3:03 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: John W. Linville @ 2008-01-23 1:44 UTC (permalink / raw)
To: davem-fT/PcQaiUtIeIZ0/mPfg9Q
Cc: netdev-u79uwXL29TY76Z2rM5mHXA,
linux-wireless-u79uwXL29TY76Z2rM5mHXA
Dave,
Here is a NULL pointer avoidance fix for iwlwifi that would be nice
to have in 2.6.24 if possible.
Thanks!
John
---
Individual patch available here:
http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/fixes
---
The following changes since commit 889c94a14e38e749c8060f597ee7825ea0764229:
Johann Felix Soden (1):
Fix file references in documentation and Kconfig
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git fixes
Reinette Chatre (1):
iwlwifi: fix possible read attempt on ucode that is not available
drivers/net/wireless/iwlwifi/iwl3945-base.c | 5 +++++
drivers/net/wireless/iwlwifi/iwl4965-base.c | 5 +++++
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 1a6b0e0..0b3ec7e 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -6342,6 +6342,11 @@ static int __iwl_up(struct iwl_priv *priv)
return 0;
}
+ if (!priv->ucode_data_backup.v_addr || !priv->ucode_data.v_addr) {
+ IWL_ERROR("ucode not available for device bringup\n");
+ return -EIO;
+ }
+
iwl_write32(priv, CSR_INT, 0xFFFFFFFF);
rc = iwl_hw_nic_init(priv);
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 6cd57c2..15a45f4 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -6698,6 +6698,11 @@ static int __iwl_up(struct iwl_priv *priv)
return 0;
}
+ if (!priv->ucode_data_backup.v_addr || !priv->ucode_data.v_addr) {
+ IWL_ERROR("ucode not available for device bringup\n");
+ return -EIO;
+ }
+
iwl_write32(priv, CSR_INT, 0xFFFFFFFF);
rc = iwl_hw_nic_init(priv);
--
John W. Linville
linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: pull request: wireless-2.6 'fixes' 2008-01-22
2008-01-23 1:44 pull request: wireless-2.6 'fixes' 2008-01-22 John W. Linville
@ 2008-01-23 3:03 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2008-01-23 3:03 UTC (permalink / raw)
To: linville; +Cc: netdev, linux-wireless
From: "John W. Linville" <linville@tuxdriver.com>
Date: Tue, 22 Jan 2008 20:44:39 -0500
> git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git fixes
I'll suck this into my tree, thanks John.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-01-23 3:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-01-23 1:44 pull request: wireless-2.6 'fixes' 2008-01-22 John W. Linville
2008-01-23 3:03 ` David Miller
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).