kata-containers/s390-tools
1
0
Fork 0
mirror of https://github.com/ibm-s390-linux/s390-tools.git synced 2026-08-05 02:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

zipl: Fix stage2 disk block memory leaks in bootmap_install_stages()

Browse Source 
This commit fixes a bug that fails to release stage2 disk blocks in case
the installation of stage1b disk blocks has failed.

Signed-off-by: Alexander Egorenkov <egorenar@linux.ibm.com>
Suggested-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Reviewed-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Acked-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
Alexander Egorenkov
2021-10-27 08:21:04 +02:00
committed by Jan Höppner
parent fa111404cb
commit 9aa59bfc4b
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
zipl/src/bootmap.c
View File

@@ -1165,6 +1165,7 @@ bootmap_install_stages(struct job_data *job, struct disk_info *info, int fd,
blocknum_t stage2_count;
size_t stage2_size;
void *stage2_data;
int rc;
switch (info->type) {
case disk_type_fba:
@@ -1176,10 +1177,11 @@ bootmap_install_stages(struct job_data *job, struct disk_info *info, int fd,
free(stage2_data);
if (stage2_count == 0)
return -1;
if (install_fba_stage1b(fd, stage1b_list, stage1b_count,
stage2_list, stage2_count, info))
return -1;
rc = install_fba_stage1b(fd, stage1b_list, stage1b_count,
stage2_list, stage2_count, info);
free(stage2_list);
if (rc)
return -1;
break;
case disk_type_eckd_ldl:
case disk_type_eckd_cdl:
@@ -1191,10 +1193,11 @@ bootmap_install_stages(struct job_data *job, struct disk_info *info, int fd,
free(stage2_data);
if (stage2_count == 0)
return -1;
if (install_eckd_stage1b(fd, stage1b_list, stage1b_count,
stage2_list, stage2_count, info))
return -1;
rc = install_eckd_stage1b(fd, stage1b_list, stage1b_count,
stage2_list, stage2_count, info);
free(stage2_list);
if (rc)
return -1;
break;
case disk_type_scsi:
case disk_type_diag: