| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1438811379-384-4-git-send-email-kamal@canonical.com> Date: Wed, 5 Aug 2015 14:47:55 -0700 From: Kamal Mostafa <kamal@...onical.com> To: linux-kernel@...r.kernel.org, stable@...r.kernel.org, kernel-team@...ts.ubuntu.com Cc: Denys Vlasenko <dvlasenk@...hat.com>, Alexei Starovoitov <ast@...mgrid.com>, Andy Lutomirski <luto@...capital.net>, Borislav Petkov <bp@...en8.de>, Frederic Weisbecker <fweisbec@...il.com>, "H. Peter Anvin" <hpa@...or.com>, Kees Cook <keescook@...omium.org>, Linus Torvalds <torvalds@...ux-foundation.org>, Oleg Nesterov <oleg@...hat.com>, Steven Rostedt <rostedt@...dmis.org>, Will Drewry <wad@...omium.org>, Ingo Molnar <mingo@...nel.org>, Ben Hutchings <ben@...adent.org.uk>, Luis Henriques <luis.henriques@...onical.com>, Kamal Mostafa <kamal@...onical.com> Subject: [PATCH 3.19.y-ckt 003/107] x86/asm/entry/64: Fold the 'test_in_nmi' macro into its only user 3.19.8-ckt5 -stable review patch. If anyone has any objections, please let me know. ------------------ From: Denys Vlasenko <dvlasenk@...hat.com> commit 0784b36448a2a85b95b6eb21a69b9045c896c065 upstream. No code changes. Signed-off-by: Denys Vlasenko <dvlasenk@...hat.com> Acked-by: Borislav Petkov <bp@...e.de> Cc: Alexei Starovoitov <ast@...mgrid.com> Cc: Andy Lutomirski <luto@...capital.net> Cc: Borislav Petkov <bp@...en8.de> Cc: Frederic Weisbecker <fweisbec@...il.com> Cc: H. Peter Anvin <hpa@...or.com> Cc: Kees Cook <keescook@...omium.org> Cc: Linus Torvalds <torvalds@...ux-foundation.org> Cc: Oleg Nesterov <oleg@...hat.com> Cc: Steven Rostedt <rostedt@...dmis.org> Cc: Will Drewry <wad@...omium.org> Link: http://lkml.kernel.org/r/1427899858-7165-1-git-send-email-dvlasenk@redhat.com Signed-off-by: Ingo Molnar <mingo@...nel.org> Signed-off-by: Ben Hutchings <ben@...adent.org.uk> Acked-by: John Johansen <john.johansen@...onical.com> Acked-by: Andy Whitcroft <apw@...onical.com> Signed-off-by: Luis Henriques <luis.henriques@...onical.com> Signed-off-by: Kamal Mostafa <kamal@...onical.com> --- arch/x86/kernel/entry_64.S | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 4ee9a23..f02ba29 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -1438,19 +1438,7 @@ ENTRY(error_exit) CFI_ENDPROC END(error_exit) -/* - * Test if a given stack is an NMI stack or not. - */ - .macro test_in_nmi reg stack nmi_ret normal_ret - cmpq %\reg, \stack - ja \normal_ret - subq $EXCEPTION_STKSZ, %\reg - cmpq %\reg, \stack - jb \normal_ret - jmp \nmi_ret - .endm - - /* runs on exception stack */ +/* Runs on exception stack */ ENTRY(nmi) INTR_FRAME PARAVIRT_ADJUST_EXCEPTION_FRAME @@ -1511,8 +1499,18 @@ ENTRY(nmi) * We check the variable because the first NMI could be in a * breakpoint routine using a breakpoint stack. */ - lea 6*8(%rsp), %rdx - test_in_nmi rdx, 4*8(%rsp), nested_nmi, first_nmi + lea 6*8(%rsp), %rdx + /* Compare the NMI stack (rdx) with the stack we came from (4*8(%rsp)) */ + cmpq %rdx, 4*8(%rsp) + /* If the stack pointer is above the NMI stack, this is a normal NMI */ + ja first_nmi + subq $EXCEPTION_STKSZ, %rdx + cmpq %rdx, 4*8(%rsp) + /* If it is below the NMI stack, it is a normal NMI */ + jb first_nmi + /* Ah, it is within the NMI stack, treat it as nested */ + jmp nested_nmi + CFI_REMEMBER_STATE nested_nmi: -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists