From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
In most cases, an access causing a LASS violation results in a #GP, for
stack accesses (those due to stack-oriented instructions, as well as
accesses that implicitly or explicitly use the SS segment register), a
stack segment fault (#SS) is generated.
Handlers for #GP and #SS will soon share code to decode the exception
address and retrieve the exception hint string. Rename the helper
function as well as the enum and array names to reflect that they are no
longer specific to #GP.
No functional change intended.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Sohil Mehta <sohil.mehta@intel.com>
---
v10:
- No change.
---
arch/x86/kernel/dumpstack.c | 6 ++--
arch/x86/kernel/traps.c | 60 ++++++++++++++++++-------------------
2 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index 71ee20102a8a..e0f85214e92f 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -441,14 +441,14 @@ void die(const char *str, struct pt_regs *regs, long err)
oops_end(flags, regs, sig);
}
-void die_addr(const char *str, struct pt_regs *regs, long err, long gp_addr)
+void die_addr(const char *str, struct pt_regs *regs, long err, long addr)
{
unsigned long flags = oops_begin();
int sig = SIGSEGV;
__die_header(str, regs, err);
- if (gp_addr)
- kasan_non_canonical_hook(gp_addr);
+ if (addr)
+ kasan_non_canonical_hook(addr);
if (__die_body(str, regs, err))
sig = 0;
oops_end(flags, regs, sig);
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index a5d10f7ae038..3ee8a36a4e6a 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -633,29 +633,29 @@ DEFINE_IDTENTRY(exc_bounds)
cond_local_irq_disable(regs);
}
-enum kernel_gp_hint {
- GP_NO_HINT,
- GP_NON_CANONICAL,
- GP_CANONICAL,
- GP_LASS_VIOLATION,
- GP_NULL_POINTER,
+enum kernel_exc_hint {
+ EXC_NO_HINT,
+ EXC_NON_CANONICAL,
+ EXC_CANONICAL,
+ EXC_LASS_VIOLATION,
+ EXC_NULL_POINTER,
};
-static const char * const kernel_gp_hint_help[] = {
- [GP_NON_CANONICAL] = "probably for non-canonical address",
- [GP_CANONICAL] = "maybe for address",
- [GP_LASS_VIOLATION] = "probably LASS violation for address",
- [GP_NULL_POINTER] = "kernel NULL pointer dereference",
+static const char * const kernel_exc_hint_help[] = {
+ [EXC_NON_CANONICAL] = "probably for non-canonical address",
+ [EXC_CANONICAL] = "maybe for address",
+ [EXC_LASS_VIOLATION] = "probably LASS violation for address",
+ [EXC_NULL_POINTER] = "kernel NULL pointer dereference",
};
/*
- * When an uncaught #GP occurs, try to determine the memory address accessed by
- * the instruction and return that address to the caller. Also, try to figure
- * out whether any part of the access to that address was non-canonical or
- * across privilege levels.
+ * When an uncaught #GP/#SS occurs, try to determine the memory address
+ * accessed by the instruction and return that address to the caller.
+ * Also, try to figure out whether any part of the access to that
+ * address was non-canonical or across privilege levels.
*/
-static enum kernel_gp_hint get_kernel_gp_address(struct pt_regs *regs,
- unsigned long *addr)
+static enum kernel_exc_hint get_kernel_exc_address(struct pt_regs *regs,
+ unsigned long *addr)
{
u8 insn_buf[MAX_INSN_SIZE];
struct insn insn;
@@ -663,41 +663,41 @@ static enum kernel_gp_hint get_kernel_gp_address(struct pt_regs *regs,
if (copy_from_kernel_nofault(insn_buf, (void *)regs->ip,
MAX_INSN_SIZE))
- return GP_NO_HINT;
+ return EXC_NO_HINT;
ret = insn_decode_kernel(&insn, insn_buf);
if (ret < 0)
- return GP_NO_HINT;
+ return EXC_NO_HINT;
*addr = (unsigned long)insn_get_addr_ref(&insn, regs);
if (*addr == -1UL)
- return GP_NO_HINT;
+ return EXC_NO_HINT;
#ifdef CONFIG_X86_64
/* Operand is in the kernel half */
if (*addr >= ~__VIRTUAL_MASK)
- return GP_CANONICAL;
+ return EXC_CANONICAL;
/* The last byte of the operand is not in the user canonical half */
if (*addr + insn.opnd_bytes - 1 > __VIRTUAL_MASK)
- return GP_NON_CANONICAL;
+ return EXC_NON_CANONICAL;
/*
* If LASS is active, a NULL pointer dereference generates a #GP
* instead of a #PF.
*/
if (*addr < PAGE_SIZE)
- return GP_NULL_POINTER;
+ return EXC_NULL_POINTER;
/*
* Assume that LASS caused the exception, because the address is
* canonical and in the user half.
*/
if (cpu_feature_enabled(X86_FEATURE_LASS))
- return GP_LASS_VIOLATION;
+ return EXC_LASS_VIOLATION;
#endif
- return GP_CANONICAL;
+ return EXC_CANONICAL;
}
#define GPFSTR "general protection fault"
@@ -816,7 +816,7 @@ static void gp_user_force_sig_segv(struct pt_regs *regs, int trapnr,
DEFINE_IDTENTRY_ERRORCODE(exc_general_protection)
{
char desc[sizeof(GPFSTR) + 50 + 2*sizeof(unsigned long) + 1] = GPFSTR;
- enum kernel_gp_hint hint = GP_NO_HINT;
+ enum kernel_exc_hint hint = EXC_NO_HINT;
unsigned long gp_addr;
if (user_mode(regs) && try_fixup_enqcmd_gp())
@@ -854,17 +854,17 @@ DEFINE_IDTENTRY_ERRORCODE(exc_general_protection)
if (error_code)
snprintf(desc, sizeof(desc), "segment-related " GPFSTR);
else
- hint = get_kernel_gp_address(regs, &gp_addr);
+ hint = get_kernel_exc_address(regs, &gp_addr);
- if (hint != GP_NO_HINT)
+ if (hint != EXC_NO_HINT)
snprintf(desc, sizeof(desc), GPFSTR ", %s 0x%lx",
- kernel_gp_hint_help[hint], gp_addr);
+ kernel_exc_hint_help[hint], gp_addr);
/*
* KASAN is interested only in the non-canonical case, clear it
* otherwise.
*/
- if (hint != GP_NON_CANONICAL)
+ if (hint != EXC_NON_CANONICAL)
gp_addr = 0;
die_addr(desc, regs, error_code, gp_addr);
--
2.43.0