From fa57fea23800336ffbdcc90f59953947aecb5db5 Mon Sep 17 00:00:00 2001
From: Patrick Daly <pdaly@codeaurora.org>
Date: Mon, 3 Apr 2017 20:25:06 -0700
Subject: [PATCH] Revert "lrdpv2: ddrcompare: Adjust virtual address from
objdump"
This reverts commit 1247c2673c3d32aa6398e53cd1977d053ab066bf
("lrdpv2: ddrcompare: Adjust virtual address from objdump")
The above did not properly consider the case where kaslr is not enabled,
resulting in a crash. Revert it so a proper fix can go in.
Change-Id: Ief1b7f2b58b99c2213499748397c14dbe430a82c
---
linux-ramdump-parser-v2/parsers/ddrcompare.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/linux-ramdump-parser-v2/parsers/ddrcompare.py b/linux-ramdump-parser-v2/parsers/ddrcompare.py
index 63cefe6..5a4866f 100644
--- a/linux-ramdump-parser-v2/parsers/ddrcompare.py
+++ b/linux-ramdump-parser-v2/parsers/ddrcompare.py
@@ -45,8 +45,7 @@ class DDRCompare(RamParser) :
bitcheck = virtual & 0x3
if bitcheck:
virtual = virtual - bitcheck
- physical = self.ramdump.virt_to_phys(
- virtual + self.ramdump.kaslr_offset)
+ physical = self.ramdump.virt_to_phys(virtual)
magic = hex(self.ramdump.read_u32(physical, False)).rstrip("L").lstrip("0x").zfill(8)
if (m.group(2) != magic):
--
GitLab