]> git.baikalelectronics.ru Git - kernel.git/commitdiff
mlxsw: core: Increase scope of RCU read-side critical section
authorIdo Schimmel <idosch@mellanox.com>
Wed, 29 Jul 2020 09:26:45 +0000 (12:26 +0300)
committerDavid S. Miller <davem@davemloft.net>
Wed, 29 Jul 2020 19:16:21 +0000 (12:16 -0700)
The lifetime of the Rx listener item ('rxl_item') is managed using RCU,
but is dereferenced outside of RCU read-side critical section, which can
lead to a use-after-free.

Fix this by increasing the scope of the RCU read-side critical section.

Fixes: d8cf4a008cb3 ("mlxsw: Introduce Mellanox switch driver core")
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mellanox/mlxsw/core.c

index d6d6fe64887b3cc232d72882750d47770a6c4e37..5e76a96a118eb9ee45330e0fa1632d0267ebeaae 100644 (file)
@@ -2051,11 +2051,13 @@ void mlxsw_core_skb_receive(struct mlxsw_core *mlxsw_core, struct sk_buff *skb,
                        break;
                }
        }
-       rcu_read_unlock();
-       if (!found)
+       if (!found) {
+               rcu_read_unlock();
                goto drop;
+       }
 
        rxl->func(skb, local_port, rxl_item->priv);
+       rcu_read_unlock();
        return;
 
 drop: