From: Jean Sacren <sakiwit@xxxxxxxxx>
In nl802154_prepare_wpan_dev_dump(), rtnl_unlock() was missing if it
returns 0. If we insert rtnl_unlock() mechanically, we will have
unbearable code duplication. Fix this bug by unifying exit paths.
Following the new exit path, clean up now the obsolete goto statement.
Fixes: a26c5fd7622d ("nl802154: add support for security layer")
Signed-off-by: Jean Sacren <sakiwit@xxxxxxxxx>
Cc: Alexander Aring <alex.aring@xxxxxxxxx>
---
net/ieee802154/nl802154.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/net/ieee802154/nl802154.c b/net/ieee802154/nl802154.c
index 1e9e86508441..0074f13ea4ca 100644
--- a/net/ieee802154/nl802154.c
+++ b/net/ieee802154/nl802154.c
@@ -253,7 +253,7 @@ nl802154_prepare_wpan_dev_dump(struct sk_buff *skb,
struct cfg802154_registered_device **rdev,
struct wpan_dev **wpan_dev)
{
- int err;
+ int err = 0;
rtnl_lock();
@@ -293,13 +293,10 @@ nl802154_prepare_wpan_dev_dump(struct sk_buff *skb,
}
}
- if (!*wpan_dev) {
+ if (!*wpan_dev)
err = -ENODEV;
- goto out_unlock;
- }
}
- return 0;
out_unlock:
rtnl_unlock();
return err;
--
To unsubscribe from this list: send the line "unsubscribe linux-wpan" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
