From: Andy Whitcroft <apw@canonical.com>
Date: Sun, 25 Mar 2018 10:05:54 +0000 (+0100)
Subject: UBUNTU: [Packaging] retpoline -- elide %rip relative indirections
X-Git-Tag: Ubuntu-4.15.0-14.15~227
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e0602aaaf2c6f4da078c138470f3a34e10e5985e;p=mirror_ubuntu-bionic-kernel.git

UBUNTU: [Packaging] retpoline -- elide %rip relative indirections

BugLink: http://bugs.launchpad.net/bugs/1758856

These are always safe because there is no way rip can be an unknown.

Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
---

diff --git a/debian/scripts/retpoline-extract-one b/debian/scripts/retpoline-extract-one
index 09d7585a16eb..e8c450a6eb25 100755
--- a/debian/scripts/retpoline-extract-one
+++ b/debian/scripts/retpoline-extract-one
@@ -223,6 +223,9 @@ disassemble()
 		BEGIN				{ file="'"$object"'"; src="'"$src"'"; }
 		/Disassembly of section/        { segment=$4; sub(":", "", segment); }
 		/^[0-9a-f][0-9a-f]* <.*>:/      { tag=$0; sub(".*<", "", tag); sub(">.*", "", tag); }
+		$0 ~ /(call|jmp)q?  *\*0x[0-9a-f]*\(%rip\)/ {
+			next
+		}
 		$0 ~ /(call|jmp)q?  *\*.*%/ {
 			sub(":", "", $1);
 			if ('"$selector"') {