]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
iwlwifi: protect SRAM debugfs
authorJohannes Berg <johannes.berg@intel.com>
Tue, 21 Aug 2012 16:57:11 +0000 (18:57 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 2 Oct 2012 17:39:45 +0000 (10:39 -0700)
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/wireless/iwlwifi/iwl-debugfs.c

index 7f97dec8534db1f60ba843bfa317b5cf303a6285..5000690138d5b374cc4fb7aa05d55d27b716519d 100644 (file)
@@ -128,6 +128,9 @@ static ssize_t iwl_dbgfs_sram_read(struct file *file,
        const struct fw_img *img;
        size_t bufsz;
 
+       if (!iwl_is_ready_rf(priv))
+               return -EAGAIN;
+
        /* default is to dump the entire data segment */
        if (!priv->dbgfs_sram_offset && !priv->dbgfs_sram_len) {
                priv->dbgfs_sram_offset = 0x800000;