Skip to contentSkip to conversation

staging: rtl8723bs: os_dep: simplify the return statement.

PATCH Superseded Saurav Girepunje 5 participants 11 messages Oct 10, 2021 – Oct 11, 2021 Staging

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 staging: rtl8723bs: os_dep: simplify the return statement.

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

---

ChangeLog V2:
-Add goto out after the memcpy for no error case return with
ret only. Free is not required on no error case.

ChangeLog V1:
-Remove the unneeded and redundant check of variable on
goto out.
-Simplify the return using multiple goto label to avoid
unneeded check.

 .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +10 -12
index 0868f56e2979..ae9579dc0848 100644
@@ -2312,7 +2312,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_zmalloc;
 	}
 
 	mon_wdev->wiphy = padapter->rtw_wdev->wiphy;
@@ -2322,23 +2322,21 @@ 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_register;
 	}
 
 	*ndev = pwdev_priv->pmon_ndev = mon_ndev;
 	memcpy(pwdev_priv->ifname_mon, name, IFNAMSIZ+1);
+	goto out;
 
-out:
-	if (ret && mon_wdev) {
-		kfree(mon_wdev);
-		mon_wdev = NULL;
-	}
-
-	if (ret && mon_ndev) {
-		free_netdev(mon_ndev);
-		*ndev = mon_ndev = NULL;
-	}
+err_register:
+	kfree(mon_wdev);
+	mon_wdev = NULL;
 
+err_zmalloc:
+	free_netdev(mon_ndev);
+	*ndev = mon_ndev = NULL;
+out:
 	return ret;
 }
 

--
2.32.0

Acked-by on v2 1/1
#1 lore raw

drivers/

Quoted 21 lines · CEST Saurav Girepunje

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

---

ChangeLog V2:
-Add goto out after the memcpy for no error case return with
ret only. Free is not required on no error case.

ChangeLog V1:
-Remove the unneeded and redundant check of variable on
goto out.
-Simplify the return using multiple goto label to avoid
unneeded check.

 .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)
drivers/ renamed from drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +0 -0

staging/rtl8723bs/os_dep/ioctl_cfg80211.c

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c static int rtw_cfg80211_add_monitor_if(struct adapter

Quoted 4 lines

index 0868f56e2979..ae9579dc0848 100644

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +0 -0
@@ -2312,7 +2312,7 @@ static int rtw_cfg80211_add_monitor_if(struct adapter 

*padapter, char *name, str

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c static int rtw_cfg80211_add_monitor_if(struct

Quoted 9 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +1 -1
 	mon_wdev = rtw_zmalloc(sizeof(struct wireless_dev));
 	if (!mon_wdev) {
 		ret = -ENOMEM;
-		goto out;
+		goto err_zmalloc;
 	}
 
 	mon_wdev->wiphy = padapter->rtw_wdev->wiphy;
@@ -2322,23 +2322,21 @@ static int rtw_cfg80211_add_monitor_if(struct 

adapter *padapter, char *name, str

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c static int rtw_cfg80211_add_monitor_if(struct adapter *padapter, char *name, str · line 2330

Quoted 10 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +2 -1
 	ret = cfg80211_register_netdevice(mon_ndev);
 	if (ret) {
-		goto out;
+		goto err_register;
 	}
 
 	*ndev = pwdev_priv->pmon_ndev = mon_ndev;
 	memcpy(pwdev_priv->ifname_mon, name, IFNAMSIZ+1);
+	goto out;

I think this is the right thing to do in order to remove the bug you introduced in v1. Well done.

Quoted 8 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +0 -7
-out:
-	if (ret && mon_wdev) {
-		kfree(mon_wdev);
-		mon_wdev = NULL;
-	}
-
-	if (ret && mon_ndev) {

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c static int rtw_cfg80211_add_monitor_if(struct adapter *padapter, char *name, str · line 2338

Quoted 10 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +6 -3
-		free_netdev(mon_ndev);
-		*ndev = mon_ndev = NULL;
-	}
+err_register:
+	kfree(mon_wdev);
+	mon_wdev = NULL;
 
+err_zmalloc:
+	free_netdev(mon_ndev);
+	*ndev = mon_ndev = NULL;

Not sure about what the Linux coding guidelines say, but I think that assigning NULL to local (on stack) pointers (mon_wdev, mon_ndev) at this point is unnecessary. There is no risk of reusing them after the "out" labelled block, because at function exit they are destroyed when the stack is unwound.

If you decide to remove these assignments, take care to leave "*ndev = NULL;" as-is (why?).

Aside from this minor objection...

Thanks,

Fabio

Quoted 9 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +1 -1
+out:
 	return ret;
 }
 
--

2.32.0

#2 lore raw
Quoted 45 lines · Fabio M. De Francesco

drivers/

Quoted 21 lines · CEST Saurav Girepunje

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

---

ChangeLog V2:
-Add goto out after the memcpy for no error case return with
ret only. Free is not required on no error case.

ChangeLog V1:
-Remove the unneeded and redundant check of variable on
goto out.
-Simplify the return using multiple goto label to avoid
unneeded check.

 .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)
drivers/ renamed from drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +0 -0

staging/rtl8723bs/os_dep/ioctl_cfg80211.c

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c static int rtw_cfg80211_add_monitor_if(struct adapter

Quoted 4 lines

index 0868f56e2979..ae9579dc0848 100644

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +0 -0
@@ -2312,7 +2312,7 @@ static int rtw_cfg80211_add_monitor_if(struct adapter 

*padapter, char *name, str

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c static int rtw_cfg80211_add_monitor_if(struct

Quoted 9 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +1 -1
 	mon_wdev = rtw_zmalloc(sizeof(struct wireless_dev));
 	if (!mon_wdev) {
 		ret = -ENOMEM;
-		goto out;
+		goto err_zmalloc;
 	}
 
 	mon_wdev->wiphy = padapter->rtw_wdev->wiphy;
@@ -2322,23 +2322,21 @@ static int rtw_cfg80211_add_monitor_if(struct 

adapter *padapter, char *name, str

Quoted 7 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +1 -1
 	ret = cfg80211_register_netdevice(mon_ndev);
 	if (ret) {
-		goto out;
+		goto err_register;
 	}
 
Quoted 7 lines

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c static int rtw_cfg80211_add_monitor_if(struct adapter *padapter, char *name, str · line 2330

Quoted 3 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +1 -0
 	*ndev = pwdev_priv->pmon_ndev = mon_ndev;
 	memcpy(pwdev_priv->ifname_mon, name, IFNAMSIZ+1);
+	goto out;

I think this is the right thing to do in order to remove the bug you introduced in v1. Well done.

Most of the people suggesting to use return 0 from here instead of goto. I will send another patch.

Quoted 25 lines
Quoted 8 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +0 -7
-out:
-	if (ret && mon_wdev) {
-		kfree(mon_wdev);
-		mon_wdev = NULL;
-	}
-
-	if (ret && mon_ndev) {

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c static int rtw_cfg80211_add_monitor_if(struct adapter *padapter, char *name, str · line 2338

Quoted 10 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +6 -3
-		free_netdev(mon_ndev);
-		*ndev = mon_ndev = NULL;
-	}
+err_register:
+	kfree(mon_wdev);
+	mon_wdev = NULL;
 
+err_zmalloc:
+	free_netdev(mon_ndev);
+	*ndev = mon_ndev = NULL;

Not sure about what the Linux coding guidelines say, but I think that assigning NULL to local (on stack) pointers (mon_wdev, mon_ndev) at this point is unnecessary. There is no risk of reusing them after the "out" labelled block, because at function exit they are destroyed when the stack is unwound.

Quoted 3 lines

If you decide to remove these assignments, take care to leave "*ndev = NULL;" as-is (why?).

Yes, This is also improvement needed on this function.

Quoted 21 lines

Aside from this minor objection...

Thanks,

Fabio

Quoted 9 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +1 -1
+out:
 	return ret;
 }
 
--

2.32.0

Regards,
Saurav

#3 lore raw
In reply to Saurav Girepunje
Quoted 5 lines · Saurav Girepunje

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

[code snip]

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c static int rtw_cfg80211_add_monitor_if(struct adapter *padapter, char *name, str · line 2330

Quoted 10 lines
  	ret = cfg80211_register_netdevice(mon_ndev);
  	if (ret) {
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +2 -1
-		goto out;
+		goto err_register;
  	}
 
  	*ndev = pwdev_priv->pmon_ndev = mon_ndev;
  	memcpy(pwdev_priv->ifname_mon, name, IFNAMSIZ+1);
+	goto out;

This looks confusing for readers. This is success path and ret is guaranteed to be 0 at this point, so isn't return 0; enough here?

Thanks

Quoted 4 lines

+out:
return ret;
}

With regards,
Pavel Skripkin

maintainer
#4 lore raw
In reply to Saurav Girepunje
Quoted 48 lines · Saurav Girepunje

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

---

ChangeLog V2:
-Add goto out after the memcpy for no error case return with
ret only. Free is not required on no error case.

ChangeLog V1:
-Remove the unneeded and redundant check of variable on
goto out.
-Simplify the return using multiple goto label to avoid
unneeded check.

 .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +3 -5
index 0868f56e2979..ae9579dc0848 100644
@@ -2312,7 +2312,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_zmalloc;
 	}
 
 	mon_wdev->wiphy = padapter->rtw_wdev->wiphy;
@@ -2322,23 +2322,21 @@ 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_register;
 	}
 
 	*ndev = pwdev_priv->pmon_ndev = mon_ndev;
 	memcpy(pwdev_priv->ifname_mon, name, IFNAMSIZ+1);
+	goto out;
 
-out:
-	if (ret && mon_wdev) {
-		kfree(mon_wdev);

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c static int rtw_cfg80211_add_monitor_if(struct adapter *padapter, char *name, str · line 2334

Quoted 10 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +3 -7
-		mon_wdev = NULL;
-	}
-
-	if (ret && mon_ndev) {
-		free_netdev(mon_ndev);
-		*ndev = mon_ndev = NULL;
-	}
+err_register:
+	kfree(mon_wdev);
+	mon_wdev = NULL;

There is no need to set a local variable like this to NULL.

thanks,

greg k-h

#5 lore raw
In reply to Saurav Girepunje
Quoted 10 lines · CEST Saurav Girepunje

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

---

ChangeLog V2:
-Add goto out after the memcpy for no error case return with
ret only. Free is not required on no error case.

Please write versions logs that reflect clearly and unequivocally what you changed between revisions and why. Subjects, Commit messages (Changelogs), and Versions logs are the "specifics" of your work. There must be no inconsistencies between these and the code or the history of the changes of the code.

You may think that I'm pedantic, but since I acked your patch, I don't want to be misunderstood to be a promoter of approximate or clearly incorrect messages.

"Free is not required on no error case" conveys the message that you have changed something that is not required but that is still potentially allowed.

This is not the case because the problem that you fix with v2 is _not_ something that is merely not required and unnecessary. You have fixed a bug that is introduced in v1. Introducing bugs is not allowed. If you do something that is not allowed you cannot simply say that it is not required.

drivers/

Quoted 11 lines

ChangeLog V1:
-Remove the unneeded and redundant check of variable on
goto out.
-Simplify the return using multiple goto label to avoid
unneeded check.

 .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)
drivers/ renamed from drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +0 -0

staging/rtl8723bs/os_dep/ioctl_cfg80211.c

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c static int rtw_cfg80211_add_monitor_if(struct adapter

Quoted 4 lines

index 0868f56e2979..ae9579dc0848 100644

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +0 -0
@@ -2312,7 +2312,7 @@ static int rtw_cfg80211_add_monitor_if(struct adapter 

*padapter, char *name, str

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c static int rtw_cfg80211_add_monitor_if(struct

Quoted 9 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +1 -1
 	mon_wdev = rtw_zmalloc(sizeof(struct wireless_dev));
 	if (!mon_wdev) {
 		ret = -ENOMEM;
-		goto out;
+		goto err_zmalloc;
 	}
 
 	mon_wdev->wiphy = padapter->rtw_wdev->wiphy;
@@ -2322,23 +2322,21 @@ static int rtw_cfg80211_add_monitor_if(struct 

adapter *padapter, char *name, str

Quoted 14 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +2 -4
 	ret = cfg80211_register_netdevice(mon_ndev);
 	if (ret) {
-		goto out;
+		goto err_register;
 	}
 
 	*ndev = pwdev_priv->pmon_ndev = mon_ndev;
 	memcpy(pwdev_priv->ifname_mon, name, IFNAMSIZ+1);
+	goto out;
 
-out:
-	if (ret && mon_wdev) {
-		kfree(mon_wdev);

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c static int rtw_cfg80211_add_monitor_if(struct adapter *padapter, char *name, str · line 2334

Quoted 10 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +3 -7
-		mon_wdev = NULL;
-	}
-
-	if (ret && mon_ndev) {
-		free_netdev(mon_ndev);
-		*ndev = mon_ndev = NULL;
-	}
+err_register:
+	kfree(mon_wdev);
+	mon_wdev = NULL;

Probably you have already read a message by Greg Kroah-Hartman that confirms what I wrote in another message: "There is no need to set a local variable like this to NULL.".

So please submit a v3. With the two changes requested above, my "acked-by" tag is confirmed again.

Thanks,

Fabio

Quoted 13 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +4 -1
+err_zmalloc:
+	free_netdev(mon_ndev);
+	*ndev = mon_ndev = NULL;
+out:
 	return ret;
 }
 
--

2.32.0

#6 lore raw
Quoted 18 lines · CEST Fabio M. De Francesco
Quoted 10 lines · CEST Saurav Girepunje

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

---

ChangeLog V2:
-Add goto out after the memcpy for no error case return with
ret only. Free is not required on no error case.

Please write versions logs that reflect clearly and unequivocally what you changed between revisions and why. Subjects, Commit messages (Changelogs), and Versions logs are the "specifics" of your work. There must be no inconsistencies between these and the code or the history of the changes of the code.

Quoted 6 lines

You may think that I'm pedantic, but since I acked your patch, I don't want to be misunderstood to be a promoter of approximate or clearly incorrect messages.

"Free is not required on no error case" conveys the message that you have changed something that is not required but that is still potentially

allowed.

Quoted 5 lines

This is not the case because the problem that you fix with v2 is _not_ something that is merely not required and unnecessary. You have fixed a bug that is introduced in v1. Introducing bugs is not allowed. If you do something that is not allowed you cannot simply say that it is not

required.

Quoted 11 lines
Quoted 11 lines

ChangeLog V1:
-Remove the unneeded and redundant check of variable on
goto out.
-Simplify the return using multiple goto label to avoid
unneeded check.

 .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)
Quoted 6 lines

drivers/

Quoted 1 line
drivers/ renamed from drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +0 -0

staging/rtl8723bs/os_dep/ioctl_cfg80211.c

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c static int rtw_cfg80211_add_monitor_if(struct

Quoted 4 lines

index 0868f56e2979..ae9579dc0848 100644

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +0 -0
@@ -2312,7 +2312,7 @@ static int rtw_cfg80211_add_monitor_if(struct 

adapter

Quoted 18 lines

*padapter, char *name, str

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c static int rtw_cfg80211_add_monitor_if(struct

Quoted 9 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +1 -1
 	mon_wdev = rtw_zmalloc(sizeof(struct wireless_dev));
 	if (!mon_wdev) {
 		ret = -ENOMEM;
-		goto out;
+		goto err_zmalloc;
 	}
 
 	mon_wdev->wiphy = padapter->rtw_wdev->wiphy;
@@ -2322,23 +2322,21 @@ static int rtw_cfg80211_add_monitor_if(struct 

adapter *padapter, char *name, str

Quoted 7 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +1 -1
 	ret = cfg80211_register_netdevice(mon_ndev);
 	if (ret) {
-		goto out;
+		goto err_register;
 	}
 
Quoted 3 lines

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c static int rtw_cfg80211_add_monitor_if(struct adapter *padapter, char *name, str · line 2330

Quoted 3 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +1 -0
 	*ndev = pwdev_priv->pmon_ndev = mon_ndev;
 	memcpy(pwdev_priv->ifname_mon, name, IFNAMSIZ+1);
+	goto out;

As Pavel noticed, probably you'd better return 'ret' here. The logic does not change, but I guess that this is what Linux developers usually do.

From a review by Dan Carpenter of one of your other patches: "[] Do nothing labels only hurt readability and introduce "forgot to set the error code bugs.".

Thanks,

Fabio

Quoted 16 lines
Quoted 4 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +0 -3
-out:
-	if (ret && mon_wdev) {
-		kfree(mon_wdev);

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c static int rtw_cfg80211_add_monitor_if(struct adapter *padapter, char *name, str · line 2334

Quoted 10 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +3 -7
-		mon_wdev = NULL;
-	}
-
-	if (ret && mon_ndev) {
-		free_netdev(mon_ndev);
-		*ndev = mon_ndev = NULL;
-	}
+err_register:
+	kfree(mon_wdev);
+	mon_wdev = NULL;

Probably you have already read a message by Greg Kroah-Hartman that

confirms

Quoted 28 lines

what I wrote in another message: "There is no need to set a local variable like this to NULL.".

So please submit a v3. With the two changes requested above, my "acked-by" tag is confirmed again.

Thanks,

Fabio

Quoted 13 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +4 -1
+err_zmalloc:
+	free_netdev(mon_ndev);
+	*ndev = mon_ndev = NULL;
+out:
 	return ret;
 }
 
--

2.32.0

#7 lore raw
Quoted 68 lines · Fabio M. De Francesco
Quoted 18 lines · CEST Fabio M. De Francesco
Quoted 10 lines · CEST Saurav Girepunje

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

---

ChangeLog V2:
-Add goto out after the memcpy for no error case return with
ret only. Free is not required on no error case.

Please write versions logs that reflect clearly and unequivocally what you changed between revisions and why. Subjects, Commit messages (Changelogs), and Versions logs are the "specifics" of your work. There must be no inconsistencies between these and the code or the history of the changes of the code.

Quoted 6 lines

You may think that I'm pedantic, but since I acked your patch, I don't want to be misunderstood to be a promoter of approximate or clearly incorrect messages.

"Free is not required on no error case" conveys the message that you have changed something that is not required but that is still potentially

allowed.

Quoted 5 lines

This is not the case because the problem that you fix with v2 is _not_ something that is merely not required and unnecessary. You have fixed a bug that is introduced in v1. Introducing bugs is not allowed. If you do something that is not allowed you cannot simply say that it is not

required.

Quoted 11 lines
Quoted 11 lines

ChangeLog V1:
-Remove the unneeded and redundant check of variable on
goto out.
-Simplify the return using multiple goto label to avoid
unneeded check.

 .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)
Quoted 6 lines

drivers/

Quoted 1 line
drivers/ renamed from drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +0 -0

staging/rtl8723bs/os_dep/ioctl_cfg80211.c

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c static int rtw_cfg80211_add_monitor_if(struct

Quoted 4 lines

index 0868f56e2979..ae9579dc0848 100644

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +0 -0
@@ -2312,7 +2312,7 @@ static int rtw_cfg80211_add_monitor_if(struct 

adapter

Quoted 18 lines

*padapter, char *name, str

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c static int rtw_cfg80211_add_monitor_if(struct

Quoted 9 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +1 -1
 	mon_wdev = rtw_zmalloc(sizeof(struct wireless_dev));
 	if (!mon_wdev) {
 		ret = -ENOMEM;
-		goto out;
+		goto err_zmalloc;
 	}
 
 	mon_wdev->wiphy = padapter->rtw_wdev->wiphy;
@@ -2322,23 +2322,21 @@ static int rtw_cfg80211_add_monitor_if(struct 

adapter *padapter, char *name, str

Quoted 7 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +1 -1
 	ret = cfg80211_register_netdevice(mon_ndev);
 	if (ret) {
-		goto out;
+		goto err_register;
 	}
 
Quoted 7 lines
Quoted 3 lines

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c static int rtw_cfg80211_add_monitor_if(struct adapter *padapter, char *name, str · line 2330

Quoted 3 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +1 -0
 	*ndev = pwdev_priv->pmon_ndev = mon_ndev;
 	memcpy(pwdev_priv->ifname_mon, name, IFNAMSIZ+1);
+	goto out;

As Pavel noticed, probably you'd better return 'ret' here. The logic does not change, but I guess that this is what Linux developers usually do.

Yes, Logic does not change. However I was also not sure which one is more preferable therefore asked for input on v1 whether to use goto or simply return value from here. It seems return from here is better choice for readability point of view.

Quoted 24 lines

From a review by Dan Carpenter of one of your other patches: "[] Do nothing labels only hurt readability and introduce "forgot to set the error code bugs.".

Thanks,

Fabio

Quoted 16 lines
Quoted 4 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +0 -3
-out:
-	if (ret && mon_wdev) {
-		kfree(mon_wdev);

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c static int rtw_cfg80211_add_monitor_if(struct adapter *padapter, char *name, str · line 2334

Quoted 10 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +3 -7
-		mon_wdev = NULL;
-	}
-
-	if (ret && mon_ndev) {
-		free_netdev(mon_ndev);
-		*ndev = mon_ndev = NULL;
-	}
+err_register:
+	kfree(mon_wdev);
+	mon_wdev = NULL;

Probably you have already read a message by Greg Kroah-Hartman that

Quoted 33 lines

confirms

Quoted 28 lines

what I wrote in another message: "There is no need to set a local variable like this to NULL.".

So please submit a v3. With the two changes requested above, my "acked-by" tag is confirmed again.

Thanks,

Fabio

Quoted 13 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +4 -1
+err_zmalloc:
+	free_netdev(mon_ndev);
+	*ndev = mon_ndev = NULL;
+out:
 	return ret;
 }
 
--

2.32.0

Regards,
Saurav

#8 lore raw
In reply to Fabio M. De Francesco
Quoted 23 lines · Fabio M. De Francesco
Quoted 10 lines · CEST Saurav Girepunje

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

---

ChangeLog V2:
-Add goto out after the memcpy for no error case return with
ret only. Free is not required on no error case.

Please write versions logs that reflect clearly and unequivocally what you changed between revisions and why. Subjects, Commit messages (Changelogs), and Versions logs are the "specifics" of your work. There must be no inconsistencies between these and the code or the history of the changes of the code.

You may think that I'm pedantic, but since I acked your patch, I don't want to be misunderstood to be a promoter of approximate or clearly incorrect messages> "Free is not required on no error case" conveys the message that you have changed something that is not required but that is still potentially allowed.

Quoted 5 lines

This is not the case because the problem that you fix with v2 is _not_ something that is merely not required and unnecessary. You have fixed a bug that is introduced in v1. Introducing bugs is not allowed. If you do something that is not allowed you cannot simply say that it is not required.

My intension was to mention changes done on V2 with respect to V1. I will try to be more clear on changelog messages.

Quoted 47 lines

drivers/

Quoted 11 lines

ChangeLog V1:
-Remove the unneeded and redundant check of variable on
goto out.
-Simplify the return using multiple goto label to avoid
unneeded check.

 .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)
drivers/ renamed from drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +0 -0

staging/rtl8723bs/os_dep/ioctl_cfg80211.c

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c static int rtw_cfg80211_add_monitor_if(struct adapter

Quoted 4 lines

index 0868f56e2979..ae9579dc0848 100644

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +0 -0
@@ -2312,7 +2312,7 @@ static int rtw_cfg80211_add_monitor_if(struct adapter 

*padapter, char *name, str

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c static int rtw_cfg80211_add_monitor_if(struct

Quoted 9 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +1 -1
 	mon_wdev = rtw_zmalloc(sizeof(struct wireless_dev));
 	if (!mon_wdev) {
 		ret = -ENOMEM;
-		goto out;
+		goto err_zmalloc;
 	}
 
 	mon_wdev->wiphy = padapter->rtw_wdev->wiphy;
@@ -2322,23 +2322,21 @@ static int rtw_cfg80211_add_monitor_if(struct 

adapter *padapter, char *name, str

Quoted 20 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +2 -10
 	ret = cfg80211_register_netdevice(mon_ndev);
 	if (ret) {
-		goto out;
+		goto err_register;
 	}
 
 	*ndev = pwdev_priv->pmon_ndev = mon_ndev;
 	memcpy(pwdev_priv->ifname_mon, name, IFNAMSIZ+1);
+	goto out;
 
-out:
-	if (ret && mon_wdev) {
-		kfree(mon_wdev);
-		mon_wdev = NULL;
-	}
-
-	if (ret && mon_ndev) {
-		free_netdev(mon_ndev);
-		*ndev = mon_ndev = NULL;
Quoted 9 lines

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c static int rtw_cfg80211_add_monitor_if(struct adapter *padapter, char *name, str · line 2334

Quoted 4 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +3 -1
-	}
+err_register:
+	kfree(mon_wdev);
+	mon_wdev = NULL;

Probably you have already read a message by Greg Kroah-Hartman that confirms what I wrote in another message: "There is no need to set a local variable like this to NULL.".

Yes, Agree this is another improvement possible on this function.

Quoted 7 lines

So please submit a v3. With the two changes requested above, my "acked-by" tag is confirmed again.

Thanks,

Fabio

I will submit a v3.

Quoted 17 lines
Quoted 13 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +4 -1
+err_zmalloc:
+	free_netdev(mon_ndev);
+	*ndev = mon_ndev = NULL;
+out:
 	return ret;
 }
 
--

2.32.0

#10 lore raw
Quoted 5 lines · Dan Carpenter
Quoted 4 lines · Saurav Girepunje

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

Quoted 8 lines
Quoted 1 line

No, sorry but the goto bunny hops, the pointless do-nothing gotos, and the come from labels are all terrible.

regards,
dan carpenter

Thanks dan for your input.

Regards,
Saurav