Skip to content

Commit 8b681bd

Browse files
OrlovEIkuba-moo
authored andcommitted
net: marvell: prestera: fix incorrect return of port_find
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: 501ef30 ("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>
1 parent f845fe5 commit 8b681bd

1 file changed

Lines changed: 10 additions & 6 deletions

File tree

drivers/net/ethernet/marvell/prestera/prestera_main.c

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,14 @@ int prestera_port_pvid_set(struct prestera_port *port, u16 vid)
5454
struct prestera_port *prestera_port_find_by_hwid(struct prestera_switch *sw,
5555
u32 dev_id, u32 hw_id)
5656
{
57-
struct prestera_port *port = NULL;
57+
struct prestera_port *port = NULL, *tmp;
5858

5959
read_lock(&sw->port_list_lock);
60-
list_for_each_entry(port, &sw->port_list, list) {
61-
if (port->dev_id == dev_id && port->hw_id == hw_id)
60+
list_for_each_entry(tmp, &sw->port_list, list) {
61+
if (tmp->dev_id == dev_id && tmp->hw_id == hw_id) {
62+
port = tmp;
6263
break;
64+
}
6365
}
6466
read_unlock(&sw->port_list_lock);
6567

@@ -68,12 +70,14 @@ struct prestera_port *prestera_port_find_by_hwid(struct prestera_switch *sw,
6870

6971
struct prestera_port *prestera_find_port(struct prestera_switch *sw, u32 id)
7072
{
71-
struct prestera_port *port = NULL;
73+
struct prestera_port *port = NULL, *tmp;
7274

7375
read_lock(&sw->port_list_lock);
74-
list_for_each_entry(port, &sw->port_list, list) {
75-
if (port->id == id)
76+
list_for_each_entry(tmp, &sw->port_list, list) {
77+
if (tmp->id == id) {
78+
port = tmp;
7679
break;
80+
}
7781
}
7882
read_unlock(&sw->port_list_lock);
7983

0 commit comments

Comments
 (0)