diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-08-21 20:57:11 +0400 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-09-19 18:04:27 +0400 |
| commit | 22d4436ddd8532fe0ef66d0c4f72e93c23831b37 (patch) | |
| tree | 1c3da36e4330fca218b3604a1ad04f3e8ee3ce84 /drivers | |
| parent | cfc41fe51189b356f4e8dd1982d1b97ee594d5fd (diff) | |
| download | linux-22d4436ddd8532fe0ef66d0c4f72e93c23831b37.tar.xz | |
iwlwifi: protect SRAM debugfs
commit 4fc79db178f0a0ede479b4713e00df2d106028b3 upstream.
If the device is not started, we can't read its
SRAM and attempting to do so will cause issues.
Protect the debugfs read.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
[bwh: Backported to 3.2:
- Adjust context
- Pass iwl_shared not iwl_priv pointer to iwl_is_ready_rf()]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-debugfs.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c index a1670e3f8bfa..93e61794738b 100644 --- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c +++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c @@ -232,6 +232,9 @@ static ssize_t iwl_dbgfs_sram_read(struct file *file, struct iwl_priv *priv = file->private_data; size_t bufsz; + if (!iwl_is_ready_rf(priv->shrd)) + return -EAGAIN; + /* default is to dump the entire data segment */ if (!priv->dbgfs_sram_offset && !priv->dbgfs_sram_len) { priv->dbgfs_sram_offset = 0x800000; |