net/mlx5e: fix up for "net/mlx5e: Move MACsec flow steering operations to be used...
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 15 Aug 2023 02:37:25 +0000 (12:37 +1000)
committerJakub Kicinski <kuba@kernel.org>
Fri, 25 Aug 2023 01:58:46 +0000 (18:58 -0700)
Recent merge had a conflict in:

  drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec_fs.c

between commit:

  aeb660171b06 ("net/mlx5e: fix double free in macsec_fs_tx_create_crypto_table_groups")

from Linus' tree and commit:

  cb5ebe4896f9 ("net/mlx5e: Move MACsec flow steering operations to be used as core library")

from the mlx5-next tree. This was missed and the former commit
got lost, bring it back.

Fixes: 3c5066c6b0a5 ("Merge branch 'mlx5-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Link: https://lore.kernel.org/r/20230815123725.4ef5b7b9@canb.auug.org.au
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/mellanox/mlx5/core/lib/macsec_fs.c

index 2f2cb67..4a07811 100644 (file)
@@ -278,6 +278,7 @@ static int macsec_fs_tx_create_crypto_table_groups(struct mlx5_macsec_flow_table
 
        if (!in) {
                kfree(ft->g);
+               ft->g = NULL;
                return -ENOMEM;
        }