diff options
| author | Tuo Li <islituo@gmail.com> | 2021-08-05 08:38:53 -0700 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2021-10-11 09:26:10 +0300 |
| commit | 4b6012a7830b813799a7faf40daa02a837e0fd5b (patch) | |
| tree | 08b275ae72b354d198158384f9b20851b36b5e32 /drivers/net/wireless/ath/dfs_pattern_detector.c | |
| parent | ec4363384c3f110561dc5ee2e59adee02dbd9f73 (diff) | |
| download | linux-4b6012a7830b813799a7faf40daa02a837e0fd5b.tar.gz linux-4b6012a7830b813799a7faf40daa02a837e0fd5b.tar.bz2 linux-4b6012a7830b813799a7faf40daa02a837e0fd5b.zip | |
ath: dfs_pattern_detector: Fix possible null-pointer dereference in channel_detector_create()
kzalloc() is used to allocate memory for cd->detectors, and if it fails,
channel_detector_exit() behind the label fail will be called:
channel_detector_exit(dpd, cd);
In channel_detector_exit(), cd->detectors is dereferenced through:
struct pri_detector *de = cd->detectors[i];
To fix this possible null-pointer dereference, check cd->detectors before
the for loop to dereference cd->detectors.
Reported-by: TOTE Robot <oslab@tsinghua.edu.cn>
Signed-off-by: Tuo Li <islituo@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210805153854.154066-1-islituo@gmail.com
Diffstat (limited to 'drivers/net/wireless/ath/dfs_pattern_detector.c')
| -rw-r--r-- | drivers/net/wireless/ath/dfs_pattern_detector.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/dfs_pattern_detector.c b/drivers/net/wireless/ath/dfs_pattern_detector.c index 80390495ea25..75cb53a3ec15 100644 --- a/drivers/net/wireless/ath/dfs_pattern_detector.c +++ b/drivers/net/wireless/ath/dfs_pattern_detector.c @@ -183,10 +183,12 @@ static void channel_detector_exit(struct dfs_pattern_detector *dpd, if (cd == NULL) return; list_del(&cd->head); - for (i = 0; i < dpd->num_radar_types; i++) { - struct pri_detector *de = cd->detectors[i]; - if (de != NULL) - de->exit(de); + if (cd->detectors) { + for (i = 0; i < dpd->num_radar_types; i++) { + struct pri_detector *de = cd->detectors[i]; + if (de != NULL) + de->exit(de); + } } kfree(cd->detectors); kfree(cd); |