openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: wireless: wcn36xx: fix potential NULL pointer dereference 

If kmalloc fails wcn36xx_smd_rsp_process will attempt to dereference
a NULL pointer.  There might be a better error recovery then just
printing an error, but printing an error message is better then the
current behaviour.

Signed-off-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Michal Nazarewicz 2013-12-02 14:09:34 +01:00 committed by John W. Linville
parent beae416b1f
commit 3469adb36c
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/net/wireless/ath/wcn36xx/smd.c
View File

@ -2041,13 +2041,20 @@ static void wcn36xx_smd_rsp_process(struct wcn36xx *wcn, void *buf, size_t len)
case WCN36XX_HAL_DELETE_STA_CONTEXT_IND: case WCN36XX_HAL_DELETE_STA_CONTEXT_IND:
mutex_lock(&wcn->hal_ind_mutex); mutex_lock(&wcn->hal_ind_mutex);
msg_ind = kmalloc(sizeof(*msg_ind), GFP_KERNEL); msg_ind = kmalloc(sizeof(*msg_ind), GFP_KERNEL);
msg_ind->msg_len = len; if (msg_ind) {
msg_ind->msg = kmalloc(len, GFP_KERNEL); msg_ind->msg_len = len;
memcpy(msg_ind->msg, buf, len); msg_ind->msg = kmalloc(len, GFP_KERNEL);
list_add_tail(&msg_ind->list, &wcn->hal_ind_queue); memcpy(msg_ind->msg, buf, len);
queue_work(wcn->hal_ind_wq, &wcn->hal_ind_work); list_add_tail(&msg_ind->list, &wcn->hal_ind_queue);
wcn36xx_dbg(WCN36XX_DBG_HAL, "indication arrived\n"); queue_work(wcn->hal_ind_wq, &wcn->hal_ind_work);
wcn36xx_dbg(WCN36XX_DBG_HAL, "indication arrived\n");
}
mutex_unlock(&wcn->hal_ind_mutex); mutex_unlock(&wcn->hal_ind_mutex);
if (msg_ind)
break;
/* FIXME: Do something smarter then just printing an error. */
wcn36xx_err("Run out of memory while handling SMD_EVENT (%d)\n",
msg_header->msg_type);
break; break;
default: default:
wcn36xx_err("SMD_EVENT (%d) not supported\n", wcn36xx_err("SMD_EVENT (%d) not supported\n",