summaryrefslogtreecommitdiff
path: root/drivers/staging/rtlwifi
diff options
context:
space:
mode:
authorNicholas Mc Guire <hofrat@osadl.org>2019-02-15 12:24:22 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-02-19 13:12:08 +0300
commite4b08e16b7d9d030b6475ef48f94d734a39f3c81 (patch)
tree3e02c6f52f1240a234ceaeeff3f36f2b0d28c56f /drivers/staging/rtlwifi
parent9bcf065e28122588a6cbee08cf847826dacbb438 (diff)
downloadlinux-e4b08e16b7d9d030b6475ef48f94d734a39f3c81.tar.xz
staging: r8822be: check kzalloc return or bail
The kzalloc() in halmac_parse_psd_data_88xx() can fail and return NULL so check the psd_set->data after allocation and if allocation failed return HALMAC_CMD_PROCESS_ERROR. Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org> Fixes: 938a0447f094 ("staging: r8822be: Add code for halmac sub-drive") Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtlwifi')
-rw-r--r--drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c
index 53f55f129a76..ec742da030db 100644
--- a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c
+++ b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c
@@ -2466,8 +2466,11 @@ halmac_parse_psd_data_88xx(struct halmac_adapter *halmac_adapter, u8 *c2h_buf,
segment_size = (u8)PSD_DATA_GET_SEGMENT_SIZE(c2h_buf);
psd_set->data_size = total_size;
- if (!psd_set->data)
+ if (!psd_set->data) {
psd_set->data = kzalloc(psd_set->data_size, GFP_KERNEL);
+ if (!psd_set->data)
+ return HALMAC_CMD_PROCESS_ERROR;
+ }
if (segment_id == 0)
psd_set->segment_size = segment_size;