leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

devlink: Protect devlink port list traversal

Browse Source 
Cited patch in fixes tag misses to protect port list traversal
while traversing per port reporter list.

Protect it using devlink instance lock.

Fixes: f4f5416601 ("devlink: Implement devlink health reporters on per-port basis")
Signed-off-by: Parav Pandit <parav@nvidia.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Parav Pandit
2020-08-21 22:12:21 +03:00
committed by David S. Miller
parent 79604c5de2
commit 5d080b5064
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
net/core/devlink.c
View File

@@ -5895,6 +5895,7 @@ devlink_nl_cmd_health_reporter_get_dumpit(struct sk_buff *msg,
list_for_each_entry(devlink, &devlink_list, list) { list_for_each_entry(devlink, &devlink_list, list) {
if (!net_eq(devlink_net(devlink), sock_net(msg->sk))) if (!net_eq(devlink_net(devlink), sock_net(msg->sk)))
continue; continue;
mutex_lock(&devlink->lock);
list_for_each_entry(port, &devlink->port_list, list) { list_for_each_entry(port, &devlink->port_list, list) {
mutex_lock(&port->reporters_lock); mutex_lock(&port->reporters_lock);
list_for_each_entry(reporter, &port->reporter_list, list) { list_for_each_entry(reporter, &port->reporter_list, list) {
@@ -5909,12 +5910,14 @@ devlink_nl_cmd_health_reporter_get_dumpit(struct sk_buff *msg,
NLM_F_MULTI); NLM_F_MULTI);
if (err) { if (err) {
mutex_unlock(&port->reporters_lock); mutex_unlock(&port->reporters_lock);
mutex_unlock(&devlink->lock);
goto out; goto out;
} }
idx++; idx++;
} }
mutex_unlock(&port->reporters_lock); mutex_unlock(&port->reporters_lock);
} }
mutex_unlock(&devlink->lock);
} }
out: out:
mutex_unlock(&devlink_mutex); mutex_unlock(&devlink_mutex);