Merge: mlxsw: spectrum_acl_tcam: Fix incorrect list API usage [rhel-9]

zampierilucas · zampierilucas · commit 1b6830eb97cd · 2024-08-12T14:07:31.000Z
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/4335 JIRA: https://issues.redhat.com/browse/RHEL-37486 CVE: CVE-2024-36006 Commits: ``` b377add ("mlxsw: spectrum_acl_tcam: Fix incorrect list API usage") ``` 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
@@ -1233,6 +1233,9 @@ mlxsw_sp_acl_tcam_vchunk_migrate_one(struct mlxsw_sp *mlxsw_sp,
 		return 0;
 	}
 
+	if (list_empty(&vchunk->ventry_list))
+		goto out;
+
 	/* If the migration got interrupted, we have the ventry to start from
 	 * stored in context.
 	 */
@@ -1282,6 +1285,7 @@ mlxsw_sp_acl_tcam_vchunk_migrate_one(struct mlxsw_sp *mlxsw_sp,
 		}
 	}
 
+out:
 	mlxsw_sp_acl_tcam_vchunk_migrate_end(mlxsw_sp, vchunk, ctx);
 	return 0;
 }
@@ -1295,6 +1299,9 @@ mlxsw_sp_acl_tcam_vchunk_migrate_all(struct mlxsw_sp *mlxsw_sp,
 	struct mlxsw_sp_acl_tcam_vchunk *vchunk;
 	int err;
 
+	if (list_empty(&vregion->vchunk_list))
+		return 0;
+
 	/* If the migration got interrupted, we have the vchunk
 	 * we are working on stored in context.
 	 */

Original file line number	Diff line number	Diff line change
`@@ -1233,6 +1233,9 @@ mlxsw_sp_acl_tcam_vchunk_migrate_one(struct mlxsw_sp *mlxsw_sp,`
`1233`	`1233`	`return 0;`
`1234`	`1234`	`}`
`1235`	`1235`
	`1236`	`+ if (list_empty(&vchunk->ventry_list))`
	`1237`	`+ goto out;`
	`1238`	`+`
`1236`	`1239`	`/* If the migration got interrupted, we have the ventry to start from`
`1237`	`1240`	`* stored in context.`
`1238`	`1241`	`*/`
`@@ -1282,6 +1285,7 @@ mlxsw_sp_acl_tcam_vchunk_migrate_one(struct mlxsw_sp *mlxsw_sp,`
`1282`	`1285`	`}`
`1283`	`1286`	`}`
`1284`	`1287`
	`1288`	`+out:`
`1285`	`1289`	`mlxsw_sp_acl_tcam_vchunk_migrate_end(mlxsw_sp, vchunk, ctx);`
`1286`	`1290`	`return 0;`
`1287`	`1291`	`}`
`@@ -1295,6 +1299,9 @@ mlxsw_sp_acl_tcam_vchunk_migrate_all(struct mlxsw_sp *mlxsw_sp,`
`1295`	`1299`	`struct mlxsw_sp_acl_tcam_vchunk *vchunk;`
`1296`	`1300`	`int err;`
`1297`	`1301`
	`1302`	`+ if (list_empty(&vregion->vchunk_list))`
	`1303`	`+ return 0;`
	`1304`	`+`
`1298`	`1305`	`/* If the migration got interrupted, we have the vchunk`
`1299`	`1306`	`* we are working on stored in context.`
`1300`	`1307`	`*/`