diff options
| author | Luciano Coelho <luciano.coelho@nokia.com> | 2010-11-30 14:58:46 +0200 |
|---|---|---|
| committer | Luciano Coelho <luciano.coelho@nokia.com> | 2010-12-02 16:17:19 +0200 |
| commit | 43a598d5e40485fcfbebe0700077e83afd803ed5 (patch) | |
| tree | 323ade5d998f39a89e8d71e644660ea572eed1e2 /drivers/net/wireless/wl12xx/debugfs.c | |
| parent | d60080ae06b98790036104f07fa897cfc151ce12 (diff) | |
| download | kernel_samsung_smdk4412-43a598d5e40485fcfbebe0700077e83afd803ed5.zip kernel_samsung_smdk4412-43a598d5e40485fcfbebe0700077e83afd803ed5.tar.gz kernel_samsung_smdk4412-43a598d5e40485fcfbebe0700077e83afd803ed5.tar.bz2 | |
wl12xx: fix illegal memset if debugfs is not enabled
If we try to reset the debugfs statistics when debugfs is not configured in
the kernel, we're memset an illegal pointer, because it has never been
allocated. So check whether we have debugfs enabled by looking into the
wl->rootdir before trying to reset the fw_stats struct.
Reported-by: Joerie de Gram <j.de.gram@gmail.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/debugfs.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/debugfs.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl12xx/debugfs.c b/drivers/net/wireless/wl12xx/debugfs.c index 2ac289e..8106a6c 100644 --- a/drivers/net/wireless/wl12xx/debugfs.c +++ b/drivers/net/wireless/wl12xx/debugfs.c @@ -414,6 +414,9 @@ err: void wl1271_debugfs_reset(struct wl1271 *wl) { + if (!wl->rootdir) + return; + memset(wl->stats.fw_stats, 0, sizeof(*wl->stats.fw_stats)); wl->stats.retry_count = 0; wl->stats.excessive_retries = 0; |