0053-x86-head-Remove-confusing-comment.patch 1.9 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354
  1. From 109bbd8c905806e929b67ca0b2eaf57ff88f10c1 Mon Sep 17 00:00:00 2001
  2. From: Josh Poimboeuf <[email protected]>
  3. Date: Mon, 18 Sep 2017 21:43:31 -0500
  4. Subject: [PATCH 053/242] x86/head: Remove confusing comment
  5. MIME-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. CVE-2017-5754
  9. This comment is actively wrong and confusing. It refers to the
  10. registers' stack offsets after the pt_regs has been constructed on the
  11. stack, but this code is *before* that.
  12. At this point the stack just has the standard iret frame, for which no
  13. comment should be needed.
  14. Signed-off-by: Josh Poimboeuf <[email protected]>
  15. Cc: Andy Lutomirski <[email protected]>
  16. Cc: Boris Ostrovsky <[email protected]>
  17. Cc: Jiri Slaby <[email protected]>
  18. Cc: Juergen Gross <[email protected]>
  19. Cc: Linus Torvalds <[email protected]>
  20. Cc: Peter Zijlstra <[email protected]>
  21. Cc: Thomas Gleixner <[email protected]>
  22. Link: http://lkml.kernel.org/r/a3c267b770fc56c9b86df9c11c552848248aace2.1505764066.git.jpoimboe@redhat.com
  23. Signed-off-by: Ingo Molnar <[email protected]>
  24. (cherry picked from commit 17270717e80de33a884ad328fea5f407d87f6d6a)
  25. Signed-off-by: Andy Whitcroft <[email protected]>
  26. Signed-off-by: Kleber Sacilotto de Souza <[email protected]>
  27. (cherry picked from commit 49187e0108184688304260a75d29b789f36f3a2b)
  28. Signed-off-by: Fabian Grünbichler <[email protected]>
  29. ---
  30. arch/x86/kernel/head_64.S | 4 ----
  31. 1 file changed, 4 deletions(-)
  32. diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
  33. index 6225550883df..627c798b2f15 100644
  34. --- a/arch/x86/kernel/head_64.S
  35. +++ b/arch/x86/kernel/head_64.S
  36. @@ -254,10 +254,6 @@ bad_address:
  37. __INIT
  38. ENTRY(early_idt_handler_array)
  39. - # 104(%rsp) %rflags
  40. - # 96(%rsp) %cs
  41. - # 88(%rsp) %rip
  42. - # 80(%rsp) error code
  43. i = 0
  44. .rept NUM_EXCEPTION_VECTORS
  45. .ifeq (EXCEPTION_ERRCODE_MASK >> i) & 1
  46. --
  47. 2.14.2