From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johannes Berg , "John W. Linville" , Jianguo Wu Subject: [PATCH 3.4 90/99] iwlwifi: protect SRAM debugfs Date: Fri, 7 Mar 2014 17:08:26 -0800 Message-Id: <20140308010614.456317088@linuxfoundation.org> In-Reply-To: <20140308010611.468206150@linuxfoundation.org> References: <20140308010611.468206150@linuxfoundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Johannes Berg 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 Signed-off-by: John W. Linville [wujg: Backported to 3.4: adjust context] Signed-off-by: Jianguo Wu Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/iwlwifi/iwl-debugfs.c | 3 +++ 1 file changed, 3 insertions(+) --- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c +++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c @@ -227,6 +227,9 @@ static ssize_t iwl_dbgfs_sram_read(struc 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;