Re: [PATCH] staging: rtl8723bs: remove null check before kfree
On Sun, Aug 27, 2017 at 10:06:47AM -0500, Larry Finger wrote: > On 08/26/2017 03:47 PM, Himanshu Jha wrote: > >Kfree on NULL pointer is a no-op and therefore checking is redundant. > > > >Signed-off-by: Himanshu Jha> >--- > > Acked-by: Larry Finger > > For some reason not fully explained, gmail is placing ALL your E-mails in my > spam folder. You might wish to explore that situation. > Yes, that's because there was some problem with account that i don't know. I got a email from Gmail: "Hi Himanshu, We’ve detected unusual activity in your Google Account himanshujha199...@gmail.com and locked it to protect your information." So, after that i changed my password and now everythings fine!! Himanshu Jha > Larry > > > drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 18 ++ > > 1 file changed, 6 insertions(+), 12 deletions(-) > > > >diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c > >b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c > >index c7bad64..d5e5f83 100644 > >--- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c > >+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c > >@@ -4120,10 +4120,8 @@ static int rtw_set_wps_beacon(struct net_device *dev, > >struct ieee_param *param, > > ie_len = len-12-2;/* 12 = param header, 2:no packed */ > >-if (pmlmepriv->wps_beacon_ie) { > >-kfree(pmlmepriv->wps_beacon_ie); > >-pmlmepriv->wps_beacon_ie = NULL; > >-} > >+kfree(pmlmepriv->wps_beacon_ie); > >+pmlmepriv->wps_beacon_ie = NULL; > > if (ie_len>0) { > > pmlmepriv->wps_beacon_ie = rtw_malloc(ie_len); > >@@ -4160,10 +4158,8 @@ static int rtw_set_wps_probe_resp(struct net_device > >*dev, struct ieee_param *par > > ie_len = len-12-2;/* 12 = param header, 2:no packed */ > >-if (pmlmepriv->wps_probe_resp_ie) { > >-kfree(pmlmepriv->wps_probe_resp_ie); > >-pmlmepriv->wps_probe_resp_ie = NULL; > >-} > >+kfree(pmlmepriv->wps_probe_resp_ie); > >+pmlmepriv->wps_probe_resp_ie = NULL; > > if (ie_len>0) { > > pmlmepriv->wps_probe_resp_ie = rtw_malloc(ie_len); > >@@ -4195,10 +4191,8 @@ static int rtw_set_wps_assoc_resp(struct net_device > >*dev, struct ieee_param *par > > ie_len = len-12-2;/* 12 = param header, 2:no packed */ > >-if (pmlmepriv->wps_assoc_resp_ie) { > >-kfree(pmlmepriv->wps_assoc_resp_ie); > >-pmlmepriv->wps_assoc_resp_ie = NULL; > >-} > >+kfree(pmlmepriv->wps_assoc_resp_ie); > >+pmlmepriv->wps_assoc_resp_ie = NULL; > > if (ie_len>0) { > > pmlmepriv->wps_assoc_resp_ie = rtw_malloc(ie_len); > > > ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: rtl8723bs: remove null check before kfree
On 08/26/2017 03:47 PM, Himanshu Jha wrote: Kfree on NULL pointer is a no-op and therefore checking is redundant. Signed-off-by: Himanshu Jha--- Acked-by: Larry Finger For some reason not fully explained, gmail is placing ALL your E-mails in my spam folder. You might wish to explore that situation. Larry drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 18 ++ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c index c7bad64..d5e5f83 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c @@ -4120,10 +4120,8 @@ static int rtw_set_wps_beacon(struct net_device *dev, struct ieee_param *param, ie_len = len-12-2;/* 12 = param header, 2:no packed */ - if (pmlmepriv->wps_beacon_ie) { - kfree(pmlmepriv->wps_beacon_ie); - pmlmepriv->wps_beacon_ie = NULL; - } + kfree(pmlmepriv->wps_beacon_ie); + pmlmepriv->wps_beacon_ie = NULL; if (ie_len>0) { pmlmepriv->wps_beacon_ie = rtw_malloc(ie_len); @@ -4160,10 +4158,8 @@ static int rtw_set_wps_probe_resp(struct net_device *dev, struct ieee_param *par ie_len = len-12-2;/* 12 = param header, 2:no packed */ - if (pmlmepriv->wps_probe_resp_ie) { - kfree(pmlmepriv->wps_probe_resp_ie); - pmlmepriv->wps_probe_resp_ie = NULL; - } + kfree(pmlmepriv->wps_probe_resp_ie); + pmlmepriv->wps_probe_resp_ie = NULL; if (ie_len>0) { pmlmepriv->wps_probe_resp_ie = rtw_malloc(ie_len); @@ -4195,10 +4191,8 @@ static int rtw_set_wps_assoc_resp(struct net_device *dev, struct ieee_param *par ie_len = len-12-2;/* 12 = param header, 2:no packed */ - if (pmlmepriv->wps_assoc_resp_ie) { - kfree(pmlmepriv->wps_assoc_resp_ie); - pmlmepriv->wps_assoc_resp_ie = NULL; - } + kfree(pmlmepriv->wps_assoc_resp_ie); + pmlmepriv->wps_assoc_resp_ie = NULL; if (ie_len>0) { pmlmepriv->wps_assoc_resp_ie = rtw_malloc(ie_len); ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: rtl8723bs: remove null check before kfree
Kfree on NULL pointer is a no-op and therefore checking is redundant. Signed-off-by: Himanshu Jha--- drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 18 ++ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c index c7bad64..d5e5f83 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c @@ -4120,10 +4120,8 @@ static int rtw_set_wps_beacon(struct net_device *dev, struct ieee_param *param, ie_len = len-12-2;/* 12 = param header, 2:no packed */ - if (pmlmepriv->wps_beacon_ie) { - kfree(pmlmepriv->wps_beacon_ie); - pmlmepriv->wps_beacon_ie = NULL; - } + kfree(pmlmepriv->wps_beacon_ie); + pmlmepriv->wps_beacon_ie = NULL; if (ie_len>0) { pmlmepriv->wps_beacon_ie = rtw_malloc(ie_len); @@ -4160,10 +4158,8 @@ static int rtw_set_wps_probe_resp(struct net_device *dev, struct ieee_param *par ie_len = len-12-2;/* 12 = param header, 2:no packed */ - if (pmlmepriv->wps_probe_resp_ie) { - kfree(pmlmepriv->wps_probe_resp_ie); - pmlmepriv->wps_probe_resp_ie = NULL; - } + kfree(pmlmepriv->wps_probe_resp_ie); + pmlmepriv->wps_probe_resp_ie = NULL; if (ie_len>0) { pmlmepriv->wps_probe_resp_ie = rtw_malloc(ie_len); @@ -4195,10 +4191,8 @@ static int rtw_set_wps_assoc_resp(struct net_device *dev, struct ieee_param *par ie_len = len-12-2;/* 12 = param header, 2:no packed */ - if (pmlmepriv->wps_assoc_resp_ie) { - kfree(pmlmepriv->wps_assoc_resp_ie); - pmlmepriv->wps_assoc_resp_ie = NULL; - } + kfree(pmlmepriv->wps_assoc_resp_ie); + pmlmepriv->wps_assoc_resp_ie = NULL; if (ie_len>0) { pmlmepriv->wps_assoc_resp_ie = rtw_malloc(ie_len); -- 2.7.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel