Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-15 21:23:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

iwlwifi: fix flow handler debug code

Browse Source 
iwl_dbgfs_fh_reg_read() can cause crashes and/or
BUG_ON in slub because the ifdefs are wrong, the
code in iwl_dump_fh() should use DEBUGFS, not
DEBUG to protect the buffer writing code.

Also, while at it, clean up the arguments to the
function, some code and make it generally safer.

Cc: stable@vger.kernel.org
Reported-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg 2012-08-21 18:57:10 +02:00 committed by John W. Linville
parent 7b4e6cfbae
commit 94543a8d4f
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/iwlwifi/pcie/internal.h
View File

@ -350,7 +350,7 @@ int iwl_queue_space(const struct iwl_queue *q);
/***************************************************** /*****************************************************
* Error handling * Error handling
******************************************************/ ******************************************************/
int iwl_dump_fh(struct iwl_trans *trans, char **buf, bool display); int iwl_dump_fh(struct iwl_trans *trans, char **buf);
void iwl_dump_csr(struct iwl_trans *trans); void iwl_dump_csr(struct iwl_trans *trans);
/***************************************************** /*****************************************************

2
drivers/net/wireless/iwlwifi/pcie/rx.c
View File

@ -555,7 +555,7 @@ static void iwl_irq_handle_error(struct iwl_trans *trans)
} }
iwl_dump_csr(trans); iwl_dump_csr(trans);
iwl_dump_fh(trans, NULL, false); iwl_dump_fh(trans, NULL);
iwl_op_mode_nic_error(trans->op_mode); iwl_op_mode_nic_error(trans->op_mode);
} }

30
drivers/net/wireless/iwlwifi/pcie/trans.c
View File

@ -1649,13 +1649,9 @@ static const char *get_fh_string(int cmd)
#undef IWL_CMD #undef IWL_CMD
} }
int iwl_dump_fh(struct iwl_trans *trans, char **buf, bool display) int iwl_dump_fh(struct iwl_trans *trans, char **buf)
{ {
int i; int i;
#ifdef CONFIG_IWLWIFI_DEBUG
int pos = 0;
size_t bufsz = 0;
#endif
static const u32 fh_tbl[] = { static const u32 fh_tbl[] = {
FH_RSCSR_CHNL0_STTS_WPTR_REG, FH_RSCSR_CHNL0_STTS_WPTR_REG,
FH_RSCSR_CHNL0_RBDCB_BASE_REG, FH_RSCSR_CHNL0_RBDCB_BASE_REG,
@ -1667,29 +1663,35 @@ int iwl_dump_fh(struct iwl_trans *trans, char **buf, bool display)
FH_TSSR_TX_STATUS_REG, FH_TSSR_TX_STATUS_REG,
FH_TSSR_TX_ERROR_REG FH_TSSR_TX_ERROR_REG
}; };
#ifdef CONFIG_IWLWIFI_DEBUG
if (display) { #ifdef CONFIG_IWLWIFI_DEBUGFS
bufsz = ARRAY_SIZE(fh_tbl) * 48 + 40; if (buf) {
int pos = 0;
size_t bufsz = ARRAY_SIZE(fh_tbl) * 48 + 40;
*buf = kmalloc(bufsz, GFP_KERNEL); *buf = kmalloc(bufsz, GFP_KERNEL);
if (!*buf) if (!*buf)
return -ENOMEM; return -ENOMEM;
pos += scnprintf(*buf + pos, bufsz - pos, pos += scnprintf(*buf + pos, bufsz - pos,
"FH register values:\n"); "FH register values:\n");
for (i = 0; i < ARRAY_SIZE(fh_tbl); i++) {
for (i = 0; i < ARRAY_SIZE(fh_tbl); i++)
pos += scnprintf(*buf + pos, bufsz - pos, pos += scnprintf(*buf + pos, bufsz - pos,
" %34s: 0X%08x\n", " %34s: 0X%08x\n",
get_fh_string(fh_tbl[i]), get_fh_string(fh_tbl[i]),
iwl_read_direct32(trans, fh_tbl[i])); iwl_read_direct32(trans, fh_tbl[i]));
}
return pos; return pos;
} }
#endif #endif
IWL_ERR(trans, "FH register values:\n"); IWL_ERR(trans, "FH register values:\n");
for (i = 0; i < ARRAY_SIZE(fh_tbl); i++) { for (i = 0; i < ARRAY_SIZE(fh_tbl); i++)
IWL_ERR(trans, " %34s: 0X%08x\n", IWL_ERR(trans, " %34s: 0X%08x\n",
get_fh_string(fh_tbl[i]), get_fh_string(fh_tbl[i]),
iwl_read_direct32(trans, fh_tbl[i])); iwl_read_direct32(trans, fh_tbl[i]));
}
return 0; return 0;
} }
@ -1982,11 +1984,11 @@ static ssize_t iwl_dbgfs_fh_reg_read(struct file *file,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
struct iwl_trans *trans = file->private_data; struct iwl_trans *trans = file->private_data;
char *buf; char *buf = NULL;
int pos = 0; int pos = 0;
ssize_t ret = -EFAULT; ssize_t ret = -EFAULT;
ret = pos = iwl_dump_fh(trans, &buf, true); ret = pos = iwl_dump_fh(trans, &buf);
if (buf) { if (buf) {
ret = simple_read_from_buffer(user_buf, ret = simple_read_from_buffer(user_buf,
count, ppos, buf, pos); count, ppos, buf, pos);