1 files changed, 24 insertions, 9 deletions

diff --git a/net/core/devlink.c b/net/core/devlink.c
index 283c3ed9f25e..1d7502a5a651 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -116,6 +116,8 @@ static struct devlink *devlink_get_from_attrs(struct net *net,
         busname = nla_data(attrs[DEVLINK_ATTR_BUS_NAME]);
         devname = nla_data(attrs[DEVLINK_ATTR_DEV_NAME]);
 
+        lockdep_assert_held(&devlink_mutex);
+
         list_for_each_entry(devlink, &devlink_list, list) {
                 if (strcmp(devlink->dev->bus->name, busname) == 0 &&
                     strcmp(dev_name(devlink->dev), devname) == 0 &&
@@ -3645,27 +3647,35 @@ static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb,
         if (err)
                 goto out_free;
 
+        mutex_lock(&devlink_mutex);
         devlink = devlink_get_from_attrs(sock_net(cb->skb->sk), attrs);
-        if (IS_ERR(devlink))
-                goto out_free;
+        if (IS_ERR(devlink)) {
+                err = PTR_ERR(devlink);
+                goto out_dev;
+        }
 
-        mutex_lock(&devlink_mutex);
         mutex_lock(&devlink->lock);
 
         if (!attrs[DEVLINK_ATTR_REGION_NAME] ||
-            !attrs[DEVLINK_ATTR_REGION_SNAPSHOT_ID])
+            !attrs[DEVLINK_ATTR_REGION_SNAPSHOT_ID]) {
+                err = -EINVAL;
                 goto out_unlock;
+        }
 
         region_name = nla_data(attrs[DEVLINK_ATTR_REGION_NAME]);
         region = devlink_region_get_by_name(devlink, region_name);
-        if (!region)
+        if (!region) {
+                err = -EINVAL;
                 goto out_unlock;
+        }
 
         hdr = genlmsg_put(skb, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq,
                           &devlink_nl_family, NLM_F_ACK | NLM_F_MULTI,
                           DEVLINK_CMD_REGION_READ);
-        if (!hdr)
+        if (!hdr) {
+                err = -EMSGSIZE;
                 goto out_unlock;
+        }
 
         err = devlink_nl_put_handle(skb, devlink);
         if (err)
@@ -3676,8 +3686,10 @@ static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb,
                 goto nla_put_failure;
 
         chunks_attr = nla_nest_start(skb, DEVLINK_ATTR_REGION_CHUNKS);
-        if (!chunks_attr)
+        if (!chunks_attr) {
+                err = -EMSGSIZE;
                 goto nla_put_failure;
+        }
 
         if (attrs[DEVLINK_ATTR_REGION_CHUNK_ADDR] &&
             attrs[DEVLINK_ATTR_REGION_CHUNK_LEN]) {
@@ -3700,8 +3712,10 @@ static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb,
                 goto nla_put_failure;
 
         /* Check if there was any progress done to prevent infinite loop */
-        if (ret_offset == start_offset)
+        if (ret_offset == start_offset) {
+                err = -EINVAL;
                 goto nla_put_failure;
+        }
 
         *((u64 *)&cb->args[0]) = ret_offset;
 
@@ -3717,10 +3731,11 @@ nla_put_failure:
         genlmsg_cancel(skb, hdr);
 out_unlock:
         mutex_unlock(&devlink->lock);
+out_dev:
         mutex_unlock(&devlink_mutex);
 out_free:
         kfree(attrs);
-        return 0;
+        return err;
 }
 
 struct devlink_info_req {