From cb2ebd0bf7e940f43d835d7517a3556f59580c0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20S=C3=B6ntgen?= <josef.soentgen@genode-labs.com>
Date: Sun, 10 Mar 2019 14:36:07 +0100
Subject: [PATCH] part_block: fix handling of chained EBR's

Fixes #3223.
---
 repos/os/recipes/pkg/test-part_block_mbr/runtime | 9 +++++++++
 repos/os/src/server/part_block/mbr.h             | 5 ++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/repos/os/recipes/pkg/test-part_block_mbr/runtime b/repos/os/recipes/pkg/test-part_block_mbr/runtime
index 7adda07ad..5a7528425 100644
--- a/repos/os/recipes/pkg/test-part_block_mbr/runtime
+++ b/repos/os/recipes/pkg/test-part_block_mbr/runtime
@@ -5,6 +5,7 @@
 	<events>
 		<timeout meaning="failed" sec="60" />
 		<log meaning="succeeded">
+			Tests finished successfully!*
 			Tests finished successfully!*
 			Tests finished successfully!
 		</log>
@@ -51,6 +52,7 @@
 				<report partitions="yes"/>
 				<policy label_prefix="test-part1" partition="6"/>
 				<policy label_prefix="test-part2" partition="1"/>
+				<policy label_prefix="test-part3" partition="9"/>
 			</config>
 		</start>
 		<start name="report_rom">
@@ -75,5 +77,12 @@
 				<any-service> <child name="part_block" /> <parent/> <any-child/> </any-service>
 			</route>
 		</start>
+		<start name="test-part3">
+			<binary name="test-block-client"/>
+			<resource name="RAM" quantum="5M" />
+			<route>
+				<any-service> <child name="part_block" /> <parent/> <any-child/> </any-service>
+			</route>
+		</start>
 	</config>
 </runtime>
diff --git a/repos/os/src/server/part_block/mbr.h b/repos/os/src/server/part_block/mbr.h
index 2a1f92977..082dd10d2 100644
--- a/repos/os/src/server/part_block/mbr.h
+++ b/repos/os/src/server/part_block/mbr.h
@@ -84,6 +84,7 @@ struct Mbr_partition_table : public Block::Partition_table
 		{
 			Partition_record *r = record;
 			unsigned lba = r->_lba;
+			unsigned last_lba = 0;
 
 			/* first logical partition number */
 			int nr = 5;
@@ -106,7 +107,9 @@ struct Mbr_partition_table : public Block::Partition_table
 			 * (relative form this EBR)
 			 */
 			r = &(ebr->_records[1]);
-			lba += ebr->_records[1]._lba;
+			lba += ebr->_records[1]._lba - last_lba;
+
+			last_lba = ebr->_records[1]._lba;
 
 			} while (r->valid());
 		}