From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755463AbbHNQ2F (ORCPT ); Fri, 14 Aug 2015 12:28:05 -0400 Received: from mail-pd0-f170.google.com ([209.85.192.170]:35838 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755104AbbHNQ2D (ORCPT ); Fri, 14 Aug 2015 12:28:03 -0400 From: Sudip Mukherjee To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, Sudip Mukherjee Subject: [PATCH] staging: rtl8188eu: fix possible NULL dereference Date: Fri, 14 Aug 2015 21:57:51 +0530 Message-Id: <1439569671-25168-1-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org dm_odm was being checked for NULL after dereferencing it. Lets check for NULL first before derefenrencing it. Signed-off-by: Sudip Mukherjee --- drivers/staging/rtl8188eu/hal/Hal8188ERateAdaptive.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/rtl8188eu/hal/Hal8188ERateAdaptive.c b/drivers/staging/rtl8188eu/hal/Hal8188ERateAdaptive.c index 15a1765..2633a13 100644 --- a/drivers/staging/rtl8188eu/hal/Hal8188ERateAdaptive.c +++ b/drivers/staging/rtl8188eu/hal/Hal8188ERateAdaptive.c @@ -659,11 +659,11 @@ void ODM_RA_UpdateRateInfo_8188E(struct odm_dm_struct *dm_odm, u8 macid, u8 Rate { struct odm_ra_info *pRaInfo = NULL; + if ((NULL == dm_odm) || (macid >= ASSOCIATE_ENTRY_NUM)) + return; ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, ("macid =%d RateID = 0x%x RateMask = 0x%x SGIEnable =%d\n", macid, RateID, RateMask, SGIEnable)); - if ((NULL == dm_odm) || (macid >= ASSOCIATE_ENTRY_NUM)) - return; pRaInfo = &(dm_odm->RAInfo[macid]); pRaInfo->RateID = RateID; @@ -676,10 +676,10 @@ void ODM_RA_SetRSSI_8188E(struct odm_dm_struct *dm_odm, u8 macid, u8 Rssi) { struct odm_ra_info *pRaInfo = NULL; - ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, - (" macid =%d Rssi =%d\n", macid, Rssi)); if ((NULL == dm_odm) || (macid >= ASSOCIATE_ENTRY_NUM)) return; + ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, + (" macid =%d Rssi =%d\n", macid, Rssi)); pRaInfo = &(dm_odm->RAInfo[macid]); pRaInfo->RssiStaRA = Rssi; -- 1.9.1