From: Eric Saint Etienne <eric.saint.etienne@oracle.com>
Date: Mon, 6 Feb 2017 14:32:41 +0000 (+0000)
Subject: sparc64: fix for user probes in high memory
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=269d8523585c1b82b53aff3cf00d88ccbaf58c35;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

sparc64: fix for user probes in high memory

When returning from the user probe code into userspace process, PC & NPC are
truncated to 32 bits.

Due to shared libraries getting loaded very high in the virtual address
space of
the process, placing a user probe inside a shared library makes the kernel
return into the process at the wrong address, causing it to seg'fault
most of
the time.

This patch prevents truncating PC and NPC.

Signed-off-by: Eric Saint Etienne <eric.saint.etienne@oracle.com>
Reviewed-by: David Aldridge <david.j.aldridge@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/arch/sparc/include/asm/uprobes.h b/arch/sparc/include/asm/uprobes.h
index f87aae5a908e..36196c17aff8 100644
--- a/arch/sparc/include/asm/uprobes.h
+++ b/arch/sparc/include/asm/uprobes.h
@@ -42,8 +42,8 @@ struct arch_uprobe {
 };
 
 struct arch_uprobe_task {
-	u32 saved_tpc;
-	u32 saved_tnpc;
+	u64 saved_tpc;
+	u64 saved_tnpc;
 };
 
 struct task_struct;