Skip to contentSkip to conversation

ARM: unwinder: fix bisection to find origin in .idx section

PATCH New Uwe Kleine-König 1 participant 1 message Dec 15, 2011 1 message not in the archive Arm (32-bit)

lore
Share & tools
lore
#1 lore raw

PATCH 1/1 ARM: unwinder: fix bisection to find origin in .idx section

In reply to a message not in the archive

The bisection implemented in unwind_find_origin() stopped to early. If there is only a single entry left to check the original code just took the end point as origin which might be wrong.

This was introduced in

	de66a97 (ARM: 7187/1: fix unwinding for XIP kernels)

---
Hello Linus,

I suggested earlier to revert de66a97. I still think this is the safest bet for 3.2. Anyhow here comes the fix that made Nick happy. If you revert I'll fold it into my resubmission.

Best regards
Uwe

 arch/arm/kernel/unwind.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/kernel/unwind.c +2 -2
index 3f03fe0..00df012 100644
@@ -160,12 +160,12 @@ static const struct unwind_idx *unwind_find_origin(
 		const struct unwind_idx *start, const struct unwind_idx *stop)
 {
 	pr_debug("%s(%p, %p)\n", __func__, start, stop);
-	while (start < stop - 1) {
+	while (start < stop) {
 		const struct unwind_idx *mid = start + ((stop - start) >> 1);
 
 		if (mid->addr_offset >= 0x40000000)
 			/* negative offset */
-			start = mid;
+			start = mid + 1;
 		else
 			/* positive offset */
 			stop = mid;
Signature · 1 line
1.7.7.2