diff options
| author | David S. Miller <davem@davemloft.net> | 2021-09-08 13:40:03 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-09-08 13:40:03 +0300 |
| commit | c324f023dbb2bcceccb7ecad5a268e58b80e638d (patch) | |
| tree | 6842debca7c9a110434f9723e90afecaa168133b /drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | |
| parent | d437f5aa23aa2b7bd07cd44b839d7546cc17166f (diff) | |
| parent | 8db6a54f3cae6a803b2cbf5390662bca641f7da8 (diff) | |
| download | linux-c324f023dbb2bcceccb7ecad5a268e58b80e638d.tar.xz | |
Merge tag 'mlx5-fixes-2021-09-07' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux
Saeed Mahameed says:
====================
mlx5 fixes 2021-09-07
This series introduces some fixes to mlx5 driver.
Please pull and let me know if there is any problem.
Included here, a patch which solves a build warning reported on
linux-kernel mailing list [1]:
Fix commit ("net/mlx5: Bridge, fix uninitialized variable usage")
I hope this series can make it to rc1.
[1] https://www.spinics.net/lists/netdev/msg765481.html
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/fs_core.c')
| -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 9fe8e3c204d6..fe501ba88bea 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c @@ -1682,14 +1682,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; } |