| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354 |
- From 8307fa79c19ddc006d5f816f6eb5127d9064dcd3 Mon Sep 17 00:00:00 2001
- From: Andy Lutomirski <[email protected]>
- Date: Sat, 4 Nov 2017 04:19:51 -0700
- Subject: [PATCH 115/232] selftests/x86/ldt_gdt: Run most existing LDT test
- cases against the GDT as well
- MIME-Version: 1.0
- Content-Type: text/plain; charset=UTF-8
- Content-Transfer-Encoding: 8bit
- CVE-2017-5754
- Now that the main test infrastructure supports the GDT, run tests
- that will pass the kernel's GDT permission tests against the GDT.
- Signed-off-by: Andy Lutomirski <[email protected]>
- Cc: Borislav Petkov <[email protected]>
- Cc: Linus Torvalds <[email protected]>
- Cc: Peter Zijlstra <[email protected]>
- Cc: Thomas Gleixner <[email protected]>
- Link: http://lkml.kernel.org/r/686a1eda63414da38fcecc2412db8dba1ae40581.1509794321.git.luto@kernel.org
- Signed-off-by: Ingo Molnar <[email protected]>
- (cherry picked from commit adedf2893c192dd09b1cc2f2dcfdd7cad99ec49d)
- Signed-off-by: Andy Whitcroft <[email protected]>
- Signed-off-by: Kleber Sacilotto de Souza <[email protected]>
- (cherry picked from commit f05c092307d8479094d83d4337d66e6e86e730a9)
- Signed-off-by: Fabian Grünbichler <[email protected]>
- ---
- tools/testing/selftests/x86/ldt_gdt.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
- diff --git a/tools/testing/selftests/x86/ldt_gdt.c b/tools/testing/selftests/x86/ldt_gdt.c
- index 337f217d0ae9..05d0d6f49c2c 100644
- --- a/tools/testing/selftests/x86/ldt_gdt.c
- +++ b/tools/testing/selftests/x86/ldt_gdt.c
- @@ -188,7 +188,15 @@ static bool install_valid_mode(const struct user_desc *d, uint32_t ar,
-
- static bool install_valid(const struct user_desc *desc, uint32_t ar)
- {
- - return install_valid_mode(desc, ar, false, true);
- + bool ret = install_valid_mode(desc, ar, false, true);
- +
- + if (desc->contents <= 1 && desc->seg_32bit &&
- + !desc->seg_not_present) {
- + /* Should work in the GDT, too. */
- + install_valid_mode(desc, ar, false, false);
- + }
- +
- + return ret;
- }
-
- static void install_invalid(const struct user_desc *desc, bool oldmode)
- --
- 2.14.2
|