Skip to content

Commit 16444d4

Browse files
committed
Merge: mlxsw: spectrum_acl_tcam: Fix memory leak during rehash [rhel-9]
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/4337 JIRA: https://issues.redhat.com/browse/RHEL-37014 CVE: CVE-2024-35853 Commits: ``` 8ca3f7a ("mlxsw: spectrum_acl_tcam: Fix memory leak during rehash") ``` Signed-off-by: Ivan Vecera <ivecera@redhat.com> Approved-by: José Ignacio Tornos Martínez <jtornosm@redhat.com> Approved-by: Petr Oros <poros@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Lucas Zampieri <lzampier@redhat.com>
2 parents 1b6830e + d41361d commit 16444d4

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,6 +1192,8 @@ mlxsw_sp_acl_tcam_vchunk_migrate_start(struct mlxsw_sp *mlxsw_sp,
11921192
{
11931193
struct mlxsw_sp_acl_tcam_chunk *new_chunk;
11941194

1195+
WARN_ON(vchunk->chunk2);
1196+
11951197
new_chunk = mlxsw_sp_acl_tcam_chunk_create(mlxsw_sp, vchunk, region);
11961198
if (IS_ERR(new_chunk))
11971199
return PTR_ERR(new_chunk);
@@ -1334,6 +1336,8 @@ mlxsw_sp_acl_tcam_vregion_migrate(struct mlxsw_sp *mlxsw_sp,
13341336
err = mlxsw_sp_acl_tcam_vchunk_migrate_all(mlxsw_sp, vregion,
13351337
ctx, credits);
13361338
if (err) {
1339+
if (ctx->this_is_rollback)
1340+
return err;
13371341
/* In case migration was not successful, we need to swap
13381342
* so the original region pointer is assigned again
13391343
* to vregion->region.

0 commit comments

Comments
 (0)