From 52ba1903b2c8ce69e8cd1de2a78c2c63cc60383b Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Tue, 18 May 2021 13:51:25 -0400 Subject: [PATCH 5/5] pc-bios/s390-ccw: don't try to read the next block if end of chunk is reached MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RH-Author: Thomas Huth Message-id: <20210518135125.191329-4-thuth@redhat.com> Patchwork-id: 101550 O-Subject: [RHEL-8.5.0 qemu-kvm PATCH 3/3] pc-bios/s390-ccw: don't try to read the next block if end of chunk is reached Bugzilla: 1942880 RH-Acked-by: Philippe Mathieu-Daudé RH-Acked-by: David Hildenbrand RH-Acked-by: Cornelia Huck Don't read the block if a null block number is reached, because this means that the end of chunk is reached. Reviewed-by: Collin Walling Signed-off-by: Marc Hartmayer Message-Id: <20210416074736.17409-1-mhartmay@linux.ibm.com> Signed-off-by: Thomas Huth (cherry picked from commit a6625d38cce3901a7c1cba069f0abcf743a293f1) Signed-off-by: Thomas Huth Signed-off-by: Danilo C. L. de Paula --- pc-bios/s390-ccw/bootmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c index 624f524331..8458b15cb6 100644 --- a/pc-bios/s390-ccw/bootmap.c +++ b/pc-bios/s390-ccw/bootmap.c @@ -212,7 +212,7 @@ static int eckd_get_boot_menu_index(block_number_t s1b_block_nr) next_block_nr = eckd_block_num(&s1b->seek[i + 1].chs); } - if (next_block_nr) { + if (next_block_nr && !is_null_block_number(next_block_nr)) { read_block(next_block_nr, s2_next_blk, "Cannot read stage2 boot loader"); } -- 2.27.0