From 799fe963a15f0bd893d2905b0d0db08e8a319e2b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 7 Aug 2014 10:55:56 -0700 Subject: [PATCH] 3.10 and 3.4 patch fixups --- ...-16-of-esp-returning-to-16-bit-stack.patch | 23 +++++++++++++++---- ...-16-of-esp-returning-to-16-bit-stack.patch | 23 +++++++++++++++---- 2 files changed, 38 insertions(+), 8 deletions(-) diff --git a/queue-3.10/x86-64-espfix-don-t-leak-bits-31-16-of-esp-returning-to-16-bit-stack.patch b/queue-3.10/x86-64-espfix-don-t-leak-bits-31-16-of-esp-returning-to-16-bit-stack.patch index 934e8f3786a..d10e7bcfb17 100644 --- a/queue-3.10/x86-64-espfix-don-t-leak-bits-31-16-of-esp-returning-to-16-bit-stack.patch +++ b/queue-3.10/x86-64-espfix-don-t-leak-bits-31-16-of-esp-returning-to-16-bit-stack.patch @@ -54,7 +54,6 @@ Cc: Arjan van de Ven Cc: comex Cc: Alexander van Heukelum Cc: Boris Ostrovsky -Cc: # consider after upstream merge Signed-off-by: Greg Kroah-Hartman --- @@ -66,9 +65,9 @@ Signed-off-by: Greg Kroah-Hartman arch/x86/kernel/espfix_64.c | 208 ++++++++++++++++++++++++++++++++ arch/x86/kernel/ldt.c | 11 - arch/x86/kernel/smpboot.c | 7 + - arch/x86/mm/dump_pagetables.c | 31 +++- + arch/x86/mm/dump_pagetables.c | 39 ++++-- init/main.c | 4 - 10 files changed, 316 insertions(+), 26 deletions(-) + 10 files changed, 324 insertions(+), 26 deletions(-) --- a/Documentation/x86/x86_64/mm.txt +++ b/Documentation/x86/x86_64/mm.txt @@ -548,7 +547,7 @@ Signed-off-by: Greg Kroah-Hartman + width, st->start_address, + width, st->current_address); + -+ delta = (st->current_address - st->start_address) >> 10; ++ delta = (st->current_address - st->start_address); + while (!(delta & 1023) && unit[1]) { + delta >>= 10; + unit++; @@ -562,6 +561,22 @@ Signed-off-by: Greg Kroah-Hartman /* * We print markers for special areas of address space, +@@ -206,7 +215,15 @@ static void note_page(struct seq_file *m + * This helps in the interpretation. + */ + if (st->current_address >= st->marker[1].start_address) { ++ if (st->marker->max_lines && ++ st->lines > st->marker->max_lines) { ++ unsigned long nskip = ++ st->lines - st->marker->max_lines; ++ seq_printf(m, "... %lu entr%s skipped ... \n", ++ nskip, nskip == 1 ? "y" : "ies"); ++ } + st->marker++; ++ st->lines = 0; + seq_printf(m, "---[ %s ]---\n", st->marker->name); + } + --- a/init/main.c +++ b/init/main.c @@ -606,6 +606,10 @@ asmlinkage void __init start_kernel(void diff --git a/queue-3.4/x86-64-espfix-don-t-leak-bits-31-16-of-esp-returning-to-16-bit-stack.patch b/queue-3.4/x86-64-espfix-don-t-leak-bits-31-16-of-esp-returning-to-16-bit-stack.patch index dcdfee546c7..ae4891785f3 100644 --- a/queue-3.4/x86-64-espfix-don-t-leak-bits-31-16-of-esp-returning-to-16-bit-stack.patch +++ b/queue-3.4/x86-64-espfix-don-t-leak-bits-31-16-of-esp-returning-to-16-bit-stack.patch @@ -54,7 +54,6 @@ Cc: Arjan van de Ven Cc: comex Cc: Alexander van Heukelum Cc: Boris Ostrovsky -Cc: # consider after upstream merge Signed-off-by: Greg Kroah-Hartman --- @@ -66,9 +65,9 @@ Signed-off-by: Greg Kroah-Hartman arch/x86/kernel/espfix_64.c | 208 ++++++++++++++++++++++++++++++++ arch/x86/kernel/ldt.c | 11 - arch/x86/kernel/smpboot.c | 7 + - arch/x86/mm/dump_pagetables.c | 31 +++- + arch/x86/mm/dump_pagetables.c | 39 ++++-- init/main.c | 4 - 10 files changed, 316 insertions(+), 26 deletions(-) + 10 files changed, 324 insertions(+), 26 deletions(-) --- a/Documentation/x86/x86_64/mm.txt +++ b/Documentation/x86/x86_64/mm.txt @@ -549,7 +548,7 @@ Signed-off-by: Greg Kroah-Hartman + width, st->start_address, + width, st->current_address); + -+ delta = (st->current_address - st->start_address) >> 10; ++ delta = (st->current_address - st->start_address); + while (!(delta & 1023) && unit[1]) { + delta >>= 10; + unit++; @@ -563,6 +562,22 @@ Signed-off-by: Greg Kroah-Hartman /* * We print markers for special areas of address space, +@@ -206,7 +215,15 @@ static void note_page(struct seq_file *m + * This helps in the interpretation. + */ + if (st->current_address >= st->marker[1].start_address) { ++ if (st->marker->max_lines && ++ st->lines > st->marker->max_lines) { ++ unsigned long nskip = ++ st->lines - st->marker->max_lines; ++ seq_printf(m, "... %lu entr%s skipped ... \n", ++ nskip, nskip == 1 ? "y" : "ies"); ++ } + st->marker++; ++ st->lines = 0; + seq_printf(m, "---[ %s ]---\n", st->marker->name); + } + --- a/init/main.c +++ b/init/main.c @@ -606,6 +606,10 @@ asmlinkage void __init start_kernel(void -- 2.47.3