lkml.org 
[lkml]   [2021]   [Dec]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net] net: marvell: prestera: fix incorrect return of port_find
    Date
    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: 501ef3066c89 ("net: marvell: prestera: Add driver for Prestera family ASIC devices")
    Signed-off-by: Yevhen Orlov <yevhen.orlov@plvision.eu>
    ---
    .../ethernet/marvell/prestera/prestera_main.c | 16 ++++++++++------
    1 file changed, 10 insertions(+), 6 deletions(-)

    diff --git a/drivers/net/ethernet/marvell/prestera/prestera_main.c b/drivers/net/ethernet/marvell/prestera/prestera_main.c
    index a0dbad5cb88d..2a5029fe5c77 100644
    --- a/drivers/net/ethernet/marvell/prestera/prestera_main.c
    +++ b/drivers/net/ethernet/marvell/prestera/prestera_main.c
    @@ -55,12 +55,14 @@ int prestera_port_pvid_set(struct prestera_port *port, u16 vid)
    struct prestera_port *prestera_port_find_by_hwid(struct prestera_switch *sw,
    u32 dev_id, u32 hw_id)
    {
    - struct prestera_port *port = NULL;
    + struct prestera_port *port = NULL, *tmp;

    read_lock(&sw->port_list_lock);
    - list_for_each_entry(port, &sw->port_list, list) {
    - if (port->dev_id == dev_id && port->hw_id == hw_id)
    + list_for_each_entry(tmp, &sw->port_list, list) {
    + if (tmp->dev_id == dev_id && tmp->hw_id == hw_id) {
    + port = tmp;
    break;
    + }
    }
    read_unlock(&sw->port_list_lock);

    @@ -69,12 +71,14 @@ 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 *port = NULL;
    + struct prestera_port *port = NULL, *tmp;

    read_lock(&sw->port_list_lock);
    - list_for_each_entry(port, &sw->port_list, list) {
    - if (port->id == id)
    + list_for_each_entry(tmp, &sw->port_list, list) {
    + if (tmp->id == id) {
    + port = tmp;
    break;
    + }
    }
    read_unlock(&sw->port_list_lock);

    --
    2.17.1
    \
     
     \ /
      Last update: 2021-12-16 18:10    [W:4.214 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site