diff options
| author | Maor Gottlieb <maorg@nvidia.com> | 2021-09-01 11:48:13 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-22 12:27:57 +0200 |
| commit | c586bc31d5b9ae7ed202fc0dcaffbaaed77bde06 (patch) | |
| tree | 8d26b29620685967b979b146332a71fc420c0f74 | |
| parent | 29a5af9112a279398c0716bd8d932c94c6a03b16 (diff) | |
| download | linux-stable-c586bc31d5b9ae7ed202fc0dcaffbaaed77bde06.tar.gz linux-stable-c586bc31d5b9ae7ed202fc0dcaffbaaed77bde06.tar.bz2 linux-stable-c586bc31d5b9ae7ed202fc0dcaffbaaed77bde06.zip | |
net/mlx5: Fix potential sleeping in atomic context
commit ee27e330a953595903979ffdb84926843595a9fe upstream.
Fixes the below flow of sleeping in atomic context by releasing
the RCU lock before calling to free_match_list.
build_match_list() <- disables preempt
-> free_match_list()
-> tree_put_node()
-> down_write_ref_node() <- take write lock
Fixes: 693c6883bbc4 ("net/mlx5: Add hash table for flow groups in flow table")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Maor Gottlieb <maorg@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c index 1d4b4e6f6fb4..0ff034b0866e 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c @@ -1675,14 +1675,13 @@ static int build_match_list(struct match_list *match_head, curr_match = kmalloc(sizeof(*curr_match), GFP_ATOMIC); if (!curr_match) { + rcu_read_unlock(); free_match_list(match_head, ft_locked); - err = -ENOMEM; - goto out; + return -ENOMEM; } curr_match->g = g; list_add_tail(&curr_match->list, &match_head->list); } -out: rcu_read_unlock(); return err; } |