2020-07-14 14:24:48

by Suraj Upadhyay

[permalink] [raw]

Subject: [PATCH v2] decnet: dn_dev: Remove an unnecessary label.

---

Remove the unnecessary label from dn_dev_ioctl() and make its error
handling simpler to read.

Signed-off-by: Suraj Upadhyay <[email protected]>
---
Changes:
v2: Fixed indentation of break statement.
On Julia's Advise.

net/decnet/dn_dev.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index 65abcf1b3210..15d42353f1a3 100644
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
@@ -462,7 +462,9 @@ int dn_dev_ioctl(unsigned int cmd, void __user *arg)
switch (cmd) {
case SIOCGIFADDR:
*((__le16 *)sdn->sdn_nodeaddr) = ifa->ifa_local;
- goto rarok;
+ if (copy_to_user(arg, ifr, DN_IFREQ_SIZE))
+ ret = -EFAULT;
+ break;

case SIOCSIFADDR:
if (!ifa) {
@@ -485,10 +487,6 @@ int dn_dev_ioctl(unsigned int cmd, void __user *arg)
rtnl_unlock();

return ret;
-rarok:
- if (copy_to_user(arg, ifr, DN_IFREQ_SIZE))
- ret = -EFAULT;
- goto done;
}

struct net_device *dn_dev_get_default(void)
--
2.17.1

---

Attachments:

(No filename) (1.01 kB)
signature.asc (849.00 B)
Download all attachments

2020-07-16 01:06:07

by Jakub Kicinski

[permalink] [raw]

Subject: Re: [PATCH v2] decnet: dn_dev: Remove an unnecessary label.

---

On Tue, 14 Jul 2020 19:53:28 +0530 Suraj Upadhyay wrote:
> Remove the unnecessary label from dn_dev_ioctl() and make its error
> handling simpler to read.
>
> Signed-off-by: Suraj Upadhyay <[email protected]>

Applied, thank you.