提交 a89dfebd 编写于 作者: R Roel Kluin 提交者: Greg Kroah-Hartman

Staging: rt2860: fix possible NULL dereferences

Allocations may fail, prevent NULL dereferences.
Signed-off-by: NRoel Kluin <roel.kluin@gmail.com>
Acked-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 18526c78
...@@ -867,6 +867,8 @@ VOID BAOriSessionTearDown( ...@@ -867,6 +867,8 @@ VOID BAOriSessionTearDown(
// force send specified TID DelBA // force send specified TID DelBA
MLME_DELBA_REQ_STRUCT DelbaReq; MLME_DELBA_REQ_STRUCT DelbaReq;
MLME_QUEUE_ELEM *Elem = (MLME_QUEUE_ELEM *) kmalloc(sizeof(MLME_QUEUE_ELEM), MEM_ALLOC_FLAG); MLME_QUEUE_ELEM *Elem = (MLME_QUEUE_ELEM *) kmalloc(sizeof(MLME_QUEUE_ELEM), MEM_ALLOC_FLAG);
if (Elem == NULL)
return;
NdisZeroMemory(&DelbaReq, sizeof(DelbaReq)); NdisZeroMemory(&DelbaReq, sizeof(DelbaReq));
NdisZeroMemory(Elem, sizeof(MLME_QUEUE_ELEM)); NdisZeroMemory(Elem, sizeof(MLME_QUEUE_ELEM));
...@@ -900,6 +902,8 @@ VOID BAOriSessionTearDown( ...@@ -900,6 +902,8 @@ VOID BAOriSessionTearDown(
{ {
MLME_DELBA_REQ_STRUCT DelbaReq; MLME_DELBA_REQ_STRUCT DelbaReq;
MLME_QUEUE_ELEM *Elem = (MLME_QUEUE_ELEM *) kmalloc(sizeof(MLME_QUEUE_ELEM), MEM_ALLOC_FLAG); MLME_QUEUE_ELEM *Elem = (MLME_QUEUE_ELEM *) kmalloc(sizeof(MLME_QUEUE_ELEM), MEM_ALLOC_FLAG);
if (Elem == NULL)
return;
NdisZeroMemory(&DelbaReq, sizeof(DelbaReq)); NdisZeroMemory(&DelbaReq, sizeof(DelbaReq));
NdisZeroMemory(Elem, sizeof(MLME_QUEUE_ELEM)); NdisZeroMemory(Elem, sizeof(MLME_QUEUE_ELEM));
......
...@@ -2011,6 +2011,8 @@ UINT deaggregate_AMSDU_announce( ...@@ -2011,6 +2011,8 @@ UINT deaggregate_AMSDU_announce(
{ {
// avoid local heap overflow, use dyanamic allocation // avoid local heap overflow, use dyanamic allocation
MLME_QUEUE_ELEM *Elem = (MLME_QUEUE_ELEM *) kmalloc(sizeof(MLME_QUEUE_ELEM), MEM_ALLOC_FLAG); MLME_QUEUE_ELEM *Elem = (MLME_QUEUE_ELEM *) kmalloc(sizeof(MLME_QUEUE_ELEM), MEM_ALLOC_FLAG);
if (Elem == NULL)
return;
memmove(Elem->Msg+(LENGTH_802_11 + LENGTH_802_1_H), pPayload, PayloadSize); memmove(Elem->Msg+(LENGTH_802_11 + LENGTH_802_1_H), pPayload, PayloadSize);
Elem->MsgLen = LENGTH_802_11 + LENGTH_802_1_H + PayloadSize; Elem->MsgLen = LENGTH_802_11 + LENGTH_802_1_H + PayloadSize;
WpaEAPOLKeyAction(pAd, Elem); WpaEAPOLKeyAction(pAd, Elem);
......
...@@ -777,6 +777,8 @@ INT __devinit rt28xx_probe( ...@@ -777,6 +777,8 @@ INT __devinit rt28xx_probe(
// Allocate RTMP_ADAPTER miniport adapter structure // Allocate RTMP_ADAPTER miniport adapter structure
handle = kmalloc(sizeof(struct os_cookie), GFP_KERNEL); handle = kmalloc(sizeof(struct os_cookie), GFP_KERNEL);
if (handle == NULL)
goto err_out_free_netdev;;
RT28XX_HANDLE_DEV_ASSIGN(handle, dev_p); RT28XX_HANDLE_DEV_ASSIGN(handle, dev_p);
status = RTMPAllocAdapterBlock(handle, &pAd); status = RTMPAllocAdapterBlock(handle, &pAd);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册