Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit adc4a3a4 authored by Kevin McKinney's avatar Kevin McKinney Committed by Greg Kroah-Hartman
Browse files

Staging: bcm: fix possible NULL dereference of psfLocalSet in CmHost.c 



Variable psfLocalSet may not follow the correct
path in the code, and therefore may not be set
properly. As such, causing a null dereference.

Signed-off-by: default avatarKevin McKinney <klmckinney1@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eb6cfa5b

drivers/staging/bcm/CmHost.c

+7 −1
Original line number Diff line number Diff line
@@ -1839,7 +1839,13 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter, /* <Pointer to the Adap 
				Adapter->PackInfo[uiSearchRuleIndex].bActive = TRUE;

			}



			if (psfLocalSet->bValid && (pstChangeIndication->u8CC == 0)) {

			if (!psfLocalSet) {

				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "No set is valid\n");

				Adapter->PackInfo[uiSearchRuleIndex].bActive = FALSE;

				Adapter->PackInfo[uiSearchRuleIndex].bValid = FALSE;

				Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value = 0;

				kfree(pstAddIndication);				

			} else if (psfLocalSet->bValid && (pstChangeIndication->u8CC == 0)) {

				Adapter->PackInfo[uiSearchRuleIndex].usVCID_Value = ntohs(pstChangeIndication->u16VCID);

				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "CC field is %d bvalid = %d\n",

						pstChangeIndication->u8CC, psfLocalSet->bValid);