Commit dac7c08f authored by Parav Pandit's avatar Parav Pandit Committed by David S. Miller

devlink: Fix list access without lock while reading region

While finding the devlink device during region reading,
devlink device list is accessed and devlink device is
returned without holding a lock. This could lead to use-after-free
accesses.

While at it, add lockdep assert to ensure that all future callers hold
the lock when calling devlink_get_from_attrs().

Fixes: 4e54795a ("devlink: Add support for region snapshot read command")
Signed-off-by: default avatarParav Pandit <parav@mellanox.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fdd41ec2
...@@ -116,6 +116,8 @@ static struct devlink *devlink_get_from_attrs(struct net *net, ...@@ -116,6 +116,8 @@ static struct devlink *devlink_get_from_attrs(struct net *net,
busname = nla_data(attrs[DEVLINK_ATTR_BUS_NAME]); busname = nla_data(attrs[DEVLINK_ATTR_BUS_NAME]);
devname = nla_data(attrs[DEVLINK_ATTR_DEV_NAME]); devname = nla_data(attrs[DEVLINK_ATTR_DEV_NAME]);
lockdep_assert_held(&devlink_mutex);
list_for_each_entry(devlink, &devlink_list, list) { list_for_each_entry(devlink, &devlink_list, list) {
if (strcmp(devlink->dev->bus->name, busname) == 0 && if (strcmp(devlink->dev->bus->name, busname) == 0 &&
strcmp(dev_name(devlink->dev), devname) == 0 && strcmp(dev_name(devlink->dev), devname) == 0 &&
...@@ -3645,13 +3647,13 @@ static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb, ...@@ -3645,13 +3647,13 @@ static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb,
if (err) if (err)
goto out_free; goto out_free;
mutex_lock(&devlink_mutex);
devlink = devlink_get_from_attrs(sock_net(cb->skb->sk), attrs); devlink = devlink_get_from_attrs(sock_net(cb->skb->sk), attrs);
if (IS_ERR(devlink)) { if (IS_ERR(devlink)) {
err = PTR_ERR(devlink); err = PTR_ERR(devlink);
goto out_free; goto out_dev;
} }
mutex_lock(&devlink_mutex);
mutex_lock(&devlink->lock); mutex_lock(&devlink->lock);
if (!attrs[DEVLINK_ATTR_REGION_NAME] || if (!attrs[DEVLINK_ATTR_REGION_NAME] ||
...@@ -3729,6 +3731,7 @@ static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb, ...@@ -3729,6 +3731,7 @@ static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb,
genlmsg_cancel(skb, hdr); genlmsg_cancel(skb, hdr);
out_unlock: out_unlock:
mutex_unlock(&devlink->lock); mutex_unlock(&devlink->lock);
out_dev:
mutex_unlock(&devlink_mutex); mutex_unlock(&devlink_mutex);
out_free: out_free:
kfree(attrs); kfree(attrs);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment