Merge: mlxsw: spectrum_acl_tcam: Fix possible use-after-free during rehash [rhel-9]

zampierilucas · zampierilucas · commit d67c66cdb4d6 · 2024-08-12T14:07:50.000Z
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/4338 JIRA: https://issues.redhat.com/browse/RHEL-37010 CVE: CVE-2024-35854 Commits: ``` 5422598 ("mlxsw: spectrum_acl_tcam: Fix possible use-after-free 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>
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c
@@ -1456,6 +1456,7 @@ mlxsw_sp_acl_tcam_vregion_rehash(struct mlxsw_sp *mlxsw_sp,
 						ctx, credits);
 	if (err) {
 		dev_err(mlxsw_sp->bus_info->dev, "Failed to migrate vregion\n");
+		return;
 	}
 
 	if (*credits >= 0)

Original file line number	Diff line number	Diff line change
`@@ -1456,6 +1456,7 @@ mlxsw_sp_acl_tcam_vregion_rehash(struct mlxsw_sp *mlxsw_sp,`
`1456`	`1456`	`ctx, credits);`
`1457`	`1457`	`if (err) {`
`1458`	`1458`	`dev_err(mlxsw_sp->bus_info->dev, "Failed to migrate vregion\n");`
	`1459`	`+ return;`
`1459`	`1460`	`}`
`1460`	`1461`
`1461`	`1462`	`if (*credits >= 0)`