diff options
| author | Dor Shaish <dor.shaish@intel.com> | 2010-06-01 09:04:08 +0200 |
|---|---|---|
| committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-06-14 19:59:25 +0200 |
| commit | f5cc6a224d9f41d963fa4cee35d3db2559e8015d (patch) | |
| tree | b6f704b7806245f995d685312f51c2d18f02fc37 /drivers/net/wireless/iwlwifi/iwl-debugfs.c | |
| parent | iwlwifi: trace full RX (diff) | |
| download | linux-f5cc6a224d9f41d963fa4cee35d3db2559e8015d.tar.xz linux-f5cc6a224d9f41d963fa4cee35d3db2559e8015d.zip | |
iwlwifi: Fix null pointer referencing in iwl_dbgfs_rx_queue_read.
Test for null pointer prior to access.
Print "Not Allocated" if null pointer.
Signed-off-by: Dor Shaish <dor.shaish@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-debugfs.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-debugfs.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c index d9f21bb9d75d..cee3d12eb383 100644 --- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c +++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c @@ -1018,8 +1018,13 @@ static ssize_t iwl_dbgfs_rx_queue_read(struct file *file, rxq->write); pos += scnprintf(buf + pos, bufsz - pos, "free_count: %u\n", rxq->free_count); - pos += scnprintf(buf + pos, bufsz - pos, "closed_rb_num: %u\n", + if (rxq->rb_stts) { + pos += scnprintf(buf + pos, bufsz - pos, "closed_rb_num: %u\n", le16_to_cpu(rxq->rb_stts->closed_rb_num) & 0x0FFF); + } else { + pos += scnprintf(buf + pos, bufsz - pos, + "closed_rb_num: Not Allocated\n"); + } return simple_read_from_buffer(user_buf, count, ppos, buf, pos); } |