Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754542AbdDJPyu (ORCPT ); Mon, 10 Apr 2017 11:54:50 -0400 Received: from mail-oi0-f66.google.com ([209.85.218.66]:34840 "EHLO mail-oi0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754259AbdDJPyr (ORCPT ); Mon, 10 Apr 2017 11:54:47 -0400 Subject: Re: [PATCH] staging: rtl8723bs: remove null test before kfree To: Aishwarya Pant , Greg Kroah-Hartman , Bastien Nocera , Hans de Goede References: <20170410134350.GA8066@aishwarya> Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org From: Larry Finger Message-ID: <229ce731-9c2f-1718-b59e-3960d4e81556@lwfinger.net> Date: Mon, 10 Apr 2017 10:54:39 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <20170410134350.GA8066@aishwarya> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4842 Lines: 177 On 04/10/2017 08:43 AM, Aishwarya Pant wrote: > kfree(..) on a NULL pointer is a no-op; the null test here is redundant. > Detected by coccicheck. > > Signed-off-by: Aishwarya Pant Acked-by: Larry Finger Thanks, Larry > --- > drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 6 ++---- > drivers/staging/rtl8723bs/hal/sdio_ops.c | 6 ++---- > drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 8 ++----- > drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 26 ++++++----------------- > drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 6 ++---- > 5 files changed, 15 insertions(+), 37 deletions(-) > > diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c > index d40ad03..910f7fa 100644 > --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c > +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c > @@ -995,8 +995,7 @@ if (1) { > rtw_hal_set_hwreg(padapter, HW_VAR_EFUSE_USAGE, (u8 *)&efuse_usage); > } > > - if (efuseTbl) > - kfree(efuseTbl); > + kfree(efuseTbl); > } > > static void hal_ReadEFuse_BT( > @@ -1128,8 +1127,7 @@ static void hal_ReadEFuse_BT( > } > > exit: > - if (efuseTbl) > - kfree(efuseTbl); > + kfree(efuseTbl); > } > > static void Hal_ReadEFuse( > diff --git a/drivers/staging/rtl8723bs/hal/sdio_ops.c b/drivers/staging/rtl8723bs/hal/sdio_ops.c > index cf09a0a..6285b72 100644 > --- a/drivers/staging/rtl8723bs/hal/sdio_ops.c > +++ b/drivers/staging/rtl8723bs/hal/sdio_ops.c > @@ -602,8 +602,7 @@ static s32 _sdio_local_read( > if (!err) > memcpy(pbuf, ptmpbuf, cnt); > > - if (ptmpbuf) > - kfree(ptmpbuf); > + kfree(ptmpbuf); > > return err; > } > @@ -646,8 +645,7 @@ s32 sdio_local_read( > if (!err) > memcpy(pbuf, ptmpbuf, cnt); > > - if (ptmpbuf) > - kfree(ptmpbuf); > + kfree(ptmpbuf); > > return err; > } > diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c > index d2c6604..52aa65b 100644 > --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c > +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c > @@ -1170,10 +1170,7 @@ static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev, > } > > addkey_end: > - if (param) > - { > - kfree((u8 *)param); > - } > + kfree((u8 *)param); > > return ret; > > @@ -1968,8 +1965,7 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t iel > pairwise_cipher, padapter->securitypriv.ndisencryptstatus, padapter->securitypriv.ndisauthtype)); > > exit: > - if (buf) > - kfree(buf); > + kfree(buf); > if (ret) > _clr_fwstate_(&padapter->mlmepriv, WIFI_UNDER_WPS); > return ret; > diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c > index fe3c42a..e11045f 100644 > --- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c > +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c > @@ -766,9 +766,7 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param, > > exit: > > - if (pwep) { > - kfree((u8 *)pwep); > - } > + kfree((u8 *)pwep); > return ret; > } > > @@ -926,7 +924,7 @@ static int rtw_set_wpa_ie(struct adapter *padapter, char *pie, unsigned short ie > > exit: > > - if (buf) kfree(buf); > + kfree(buf); > > return ret; > } > @@ -2502,10 +2500,7 @@ static int rtw_wx_set_enc_ext(struct net_device *dev, > ret = wpa_set_encryption(dev, param, param_len); > > exit: > - if (param) > - { > - kfree((u8 *)param); > - } > + kfree((u8 *)param); > > return ret; > } > @@ -4135,11 +4130,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, > } > > exit: > - > - if (pwep) > - { > - kfree((u8 *)pwep); > - } > + kfree((u8 *)pwep); > > return ret; > > @@ -5785,12 +5776,9 @@ static int rtw_ioctl_wext_private(struct net_device *dev, union iwreq_data *wrq_ > } > > exit: > - if (input) > - kfree(input); > - if (buffer) > - kfree(buffer); > - if (output) > - kfree(output); > + kfree(input); > + kfree(buffer); > + kfree(output); > > return err; > } > diff --git a/drivers/staging/rtl8723bs/os_dep/xmit_linux.c b/drivers/staging/rtl8723bs/os_dep/xmit_linux.c > index 66dfec1..7696816 100644 > --- a/drivers/staging/rtl8723bs/os_dep/xmit_linux.c > +++ b/drivers/staging/rtl8723bs/os_dep/xmit_linux.c > @@ -76,10 +76,8 @@ int rtw_os_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *pxmitb > > void rtw_os_xmit_resource_free(struct adapter *padapter, struct xmit_buf *pxmitbuf, u32 free_sz, u8 flag) > { > - if (free_sz > 0) { > - if (pxmitbuf->pallocated_buf) > - kfree(pxmitbuf->pallocated_buf); > - } > + if (free_sz > 0) > + kfree(pxmitbuf->pallocated_buf); > } > > #define WMM_XMIT_THRESHOLD (NR_XMITFRAME*2/5) >