xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: marvell: prestera: fix incorrect return of port_find

Browse Source 
[ Upstream commit 8b681bd7c301c423fbe97a6b23388a2180ff04ca ]

In case, when some ports is in list and we don't find requested - we
return last iterator state and not return NULL as expected.

Fixes: 501ef3066c ("net: marvell: prestera: Add driver for Prestera family ASIC devices")
Signed-off-by: Yevhen Orlov <yevhen.orlov@plvision.eu>
Link: https://lore.kernel.org/r/20211216170736.8851-1-yevhen.orlov@plvision.eu
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Yevhen Orlov
2021-12-16 19:07:36 +02:00
committed by Greg Kroah-Hartman
parent 861b4413e4
commit 78e49d77e5
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/ethernet/marvell/prestera/prestera_main.c
View File

@@ -50,13 +50,15 @@ int prestera_port_pvid_set(struct prestera_port *port, u16 vid)
struct prestera_port *prestera_port_find_by_hwid(struct prestera_switch *sw, struct prestera_port *prestera_port_find_by_hwid(struct prestera_switch *sw,
u32 dev_id, u32 hw_id) u32 dev_id, u32 hw_id)
{ {
struct prestera_port *port = NULL; struct prestera_port *port = NULL, *tmp;
read_lock(&sw->port_list_lock); read_lock(&sw->port_list_lock);
list_for_each_entry(port, &sw->port_list, list) { list_for_each_entry(tmp, &sw->port_list, list) {
if (port->dev_id == dev_id && port->hw_id == hw_id) if (tmp->dev_id == dev_id && tmp->hw_id == hw_id) {
port = tmp;
break; break;
} }
}
read_unlock(&sw->port_list_lock); read_unlock(&sw->port_list_lock);
return port; return port;
@@ -64,13 +66,15 @@ struct prestera_port *prestera_port_find_by_hwid(struct prestera_switch *sw,
struct prestera_port *prestera_find_port(struct prestera_switch *sw, u32 id) struct prestera_port *prestera_find_port(struct prestera_switch *sw, u32 id)
{ {
struct prestera_port *port = NULL; struct prestera_port *port = NULL, *tmp;
read_lock(&sw->port_list_lock); read_lock(&sw->port_list_lock);
list_for_each_entry(port, &sw->port_list, list) { list_for_each_entry(tmp, &sw->port_list, list) {
if (port->id == id) if (tmp->id == id) {
port = tmp;
break; break;
} }
}
read_unlock(&sw->port_list_lock); read_unlock(&sw->port_list_lock);
return port; return port;