linux-kernel - [PATCH v3] staging: rtl8723bs: os_dep: simplify the return statement

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Thu, 14 Oct 2021 20:10:00 +0530
From:   Saurav Girepunje <saurav.girepunje@...il.com>
To:     gregkh@...uxfoundation.org, fabioaiuto83@...il.com,
        ross.schm.dev@...il.com, marcocesati@...il.com,
        saurav.girepunje@...il.com, insafonov@...il.com,
        linux-staging@...ts.linux.dev, linux-kernel@...r.kernel.org
Cc:     saurav.girepunje@...mail.com
Subject: [PATCH v3] staging: rtl8723bs: os_dep: simplify the return statement

Remove goto statement where function simply return value without doing
any cleanup action.

Simplify the return using goto label to avoid unneeded 'if' condition
check.

Remove the unneeded and redundant check of variable on goto.

Remove the assignment of NULL on local variable.

Signed-off-by: Saurav Girepunje <saurav.girepunje@...il.com>
---

ChangeLog V3:

	-Remove goto statement where function simply return value
	 without doing any cleanup action.
	-Remove the assignment of NULL on local variable.
	-Replace the goto statement added after the memcpy on V2.
	 with return 0 statement.

ChangeLog V2:

	-Add goto out after the memcpy for no error case return with
	 ret only. On V1 doing free, which was not required for no error
	 case.

ChangeLog V1:

	-Remove the unneeded and redundant check of variable on
	 goto out.
	-Simplify the return using goto label to avoid unneeded if
	 condition check.

 .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index 0868f56e2979..217b86bfb722 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -2281,19 +2281,16 @@ static int rtw_cfg80211_add_monitor_if(struct adapter *padapter, char *name, str
 	struct rtw_wdev_priv *pwdev_priv = adapter_wdev_data(padapter);

 	if (!name) {
-		ret = -EINVAL;
-		goto out;
+		return -EINVAL;
 	}

 	if (pwdev_priv->pmon_ndev) {
-		ret = -EBUSY;
-		goto out;
+		return -EBUSY;
 	}

 	mon_ndev = alloc_etherdev(sizeof(struct rtw_netdev_priv_indicator));
 	if (!mon_ndev) {
-		ret = -ENOMEM;
-		goto out;
+		return -ENOMEM;
 	}

 	mon_ndev->type = ARPHRD_IEEE80211_RADIOTAP;
@@ -2312,7 +2309,7 @@ static int rtw_cfg80211_add_monitor_if(struct adapter *padapter, char *name, str
 	mon_wdev = rtw_zmalloc(sizeof(struct wireless_dev));
 	if (!mon_wdev) {
 		ret = -ENOMEM;
-		goto out;
+		goto err_free_mon_ndev;
 	}

 	mon_wdev->wiphy = padapter->rtw_wdev->wiphy;
@@ -2322,22 +2319,20 @@ static int rtw_cfg80211_add_monitor_if(struct adapter *padapter, char *name, str

 	ret = cfg80211_register_netdevice(mon_ndev);
 	if (ret) {
-		goto out;
+		goto err_free_mon_wdev;
 	}

 	*ndev = pwdev_priv->pmon_ndev = mon_ndev;
 	memcpy(pwdev_priv->ifname_mon, name, IFNAMSIZ+1);

-out:
-	if (ret && mon_wdev) {
-		kfree(mon_wdev);
-		mon_wdev = NULL;
-	}
+	return 0;

-	if (ret && mon_ndev) {
-		free_netdev(mon_ndev);
-		*ndev = mon_ndev = NULL;
-	}
+err_free_mon_wdev:
+	kfree(mon_wdev);
+
+err_free_mon_ndev:
+	free_netdev(mon_ndev);
+	*ndev = NULL;

 	return ret;
 }
--
2.33.0