From 97e6f6b23a925e5530b9f4d7ff0892f9b17b1e8a Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Mon, 31 Aug 2009 12:26:43 +0200 Subject: [PATCH] --- yaml --- r: 162555 b: refs/heads/master c: a89dfebdad050598479c73c1a22e2323085b5596 h: refs/heads/master i: 162553: 471e7e9ea652727284c964b7d250fbef2e395536 162551: 6f7e5ccc2a62b1329804fd5409d814b2a15a0d24 v: v3 --- [refs] | 2 +- trunk/drivers/staging/rt2860/common/ba_action.c | 4 ++++ trunk/drivers/staging/rt2860/common/cmm_data.c | 2 ++ trunk/drivers/staging/rt2860/rt_main_dev.c | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2c4703999f8d..05ee4ad10d5b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18526c7896fca5229c8d7b4b415605a17f9952d0 +refs/heads/master: a89dfebdad050598479c73c1a22e2323085b5596 diff --git a/trunk/drivers/staging/rt2860/common/ba_action.c b/trunk/drivers/staging/rt2860/common/ba_action.c index 79a51640f6bc..b7bbe99d4d57 100644 --- a/trunk/drivers/staging/rt2860/common/ba_action.c +++ b/trunk/drivers/staging/rt2860/common/ba_action.c @@ -867,6 +867,8 @@ VOID BAOriSessionTearDown( // force send specified TID DelBA MLME_DELBA_REQ_STRUCT DelbaReq; MLME_QUEUE_ELEM *Elem = (MLME_QUEUE_ELEM *) kmalloc(sizeof(MLME_QUEUE_ELEM), MEM_ALLOC_FLAG); + if (Elem == NULL) + return; NdisZeroMemory(&DelbaReq, sizeof(DelbaReq)); NdisZeroMemory(Elem, sizeof(MLME_QUEUE_ELEM)); @@ -900,6 +902,8 @@ VOID BAOriSessionTearDown( { MLME_DELBA_REQ_STRUCT DelbaReq; MLME_QUEUE_ELEM *Elem = (MLME_QUEUE_ELEM *) kmalloc(sizeof(MLME_QUEUE_ELEM), MEM_ALLOC_FLAG); + if (Elem == NULL) + return; NdisZeroMemory(&DelbaReq, sizeof(DelbaReq)); NdisZeroMemory(Elem, sizeof(MLME_QUEUE_ELEM)); diff --git a/trunk/drivers/staging/rt2860/common/cmm_data.c b/trunk/drivers/staging/rt2860/common/cmm_data.c index abbbcbfcf26d..774fabb0be40 100644 --- a/trunk/drivers/staging/rt2860/common/cmm_data.c +++ b/trunk/drivers/staging/rt2860/common/cmm_data.c @@ -2011,6 +2011,8 @@ UINT deaggregate_AMSDU_announce( { // avoid local heap overflow, use dyanamic allocation 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); Elem->MsgLen = LENGTH_802_11 + LENGTH_802_1_H + PayloadSize; WpaEAPOLKeyAction(pAd, Elem); diff --git a/trunk/drivers/staging/rt2860/rt_main_dev.c b/trunk/drivers/staging/rt2860/rt_main_dev.c index 7f4441462a12..22f37cfbefbe 100644 --- a/trunk/drivers/staging/rt2860/rt_main_dev.c +++ b/trunk/drivers/staging/rt2860/rt_main_dev.c @@ -777,6 +777,8 @@ INT __devinit rt28xx_probe( // Allocate RTMP_ADAPTER miniport adapter structure handle = kmalloc(sizeof(struct os_cookie), GFP_KERNEL); + if (handle == NULL) + goto err_out_free_netdev;; RT28XX_HANDLE_DEV_ASSIGN(handle, dev_p); status = RTMPAllocAdapterBlock(handle, &pAd);