From: Greg Kroah-Hartman Date: Mon, 13 Nov 2017 09:06:12 +0000 (+0100) Subject: 4.4-stable patches X-Git-Tag: v3.18.81~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c80fa9c8f8776518384609ba5e642679123414b;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: pkcs-7-fix-unitialized-boolean-want.patch x86-oprofile-ppro-do-not-use-__this_cpu-in-preemptible-context.patch --- diff --git a/queue-4.4/pkcs-7-fix-unitialized-boolean-want.patch b/queue-4.4/pkcs-7-fix-unitialized-boolean-want.patch new file mode 100644 index 00000000000..596ddb16961 --- /dev/null +++ b/queue-4.4/pkcs-7-fix-unitialized-boolean-want.patch @@ -0,0 +1,34 @@ +From 06aae592425701851e02bb850cb9f4997f0ae163 Mon Sep 17 00:00:00 2001 +From: Colin Ian King +Date: Sat, 27 Feb 2016 12:45:26 +0000 +Subject: PKCS#7: fix unitialized boolean 'want' + +From: Colin Ian King + +commit 06aae592425701851e02bb850cb9f4997f0ae163 upstream. + +The boolean want is not initialized and hence garbage. The default should +be false (later it is only set to true on tne sinfo->authattrs check). + +Found with static analysis using CoverityScan + +Signed-off-by: Colin Ian King +Signed-off-by: David Howells +Cc: Ben Hutchings +Signed-off-by: Greg Kroah-Hartman + +--- + crypto/asymmetric_keys/pkcs7_parser.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/crypto/asymmetric_keys/pkcs7_parser.c ++++ b/crypto/asymmetric_keys/pkcs7_parser.c +@@ -87,7 +87,7 @@ EXPORT_SYMBOL_GPL(pkcs7_free_message); + static int pkcs7_check_authattrs(struct pkcs7_message *msg) + { + struct pkcs7_signed_info *sinfo; +- bool want; ++ bool want = false; + + sinfo = msg->signed_infos; + if (!sinfo) diff --git a/queue-4.4/series b/queue-4.4/series index d5fb382268c..a35d750198f 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -52,3 +52,5 @@ drm-vmwgfx-fix-ubuntu-17.10-wayland-black-screen-issue.patch rbd-use-gfp_noio-for-parent-stat-and-data-requests.patch can-sun4i-handle-overrun-in-rx-fifo.patch can-c_can-don-t-indicate-triple-sampling-support-for-d_can.patch +x86-oprofile-ppro-do-not-use-__this_cpu-in-preemptible-context.patch +pkcs-7-fix-unitialized-boolean-want.patch diff --git a/queue-4.4/x86-oprofile-ppro-do-not-use-__this_cpu-in-preemptible-context.patch b/queue-4.4/x86-oprofile-ppro-do-not-use-__this_cpu-in-preemptible-context.patch new file mode 100644 index 00000000000..733a2551d9a --- /dev/null +++ b/queue-4.4/x86-oprofile-ppro-do-not-use-__this_cpu-in-preemptible-context.patch @@ -0,0 +1,56 @@ +From a743bbeef27b9176987ec0cb7f906ab0ab52d1da Mon Sep 17 00:00:00 2001 +From: Borislav Petkov +Date: Tue, 7 Nov 2017 18:53:07 +0100 +Subject: x86/oprofile/ppro: Do not use __this_cpu*() in preemptible context + +From: Borislav Petkov + +commit a743bbeef27b9176987ec0cb7f906ab0ab52d1da upstream. + +The warning below says it all: + + BUG: using __this_cpu_read() in preemptible [00000000] code: swapper/0/1 + caller is __this_cpu_preempt_check + CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.14.0-rc8 #4 + Call Trace: + dump_stack + check_preemption_disabled + ? do_early_param + __this_cpu_preempt_check + arch_perfmon_init + op_nmi_init + ? alloc_pci_root_info + oprofile_arch_init + oprofile_init + do_one_initcall + ... + +These accessors should not have been used in the first place: it is PPro so +no mixed silicon revisions and thus it can simply use boot_cpu_data. + +Reported-by: Fengguang Wu +Tested-by: Fengguang Wu +Fix-creation-mandated-by: Linus Torvalds +Signed-off-by: Borislav Petkov +Signed-off-by: Thomas Gleixner +Cc: Robert Richter +Cc: x86@kernel.org +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/oprofile/op_model_ppro.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/arch/x86/oprofile/op_model_ppro.c ++++ b/arch/x86/oprofile/op_model_ppro.c +@@ -212,8 +212,8 @@ static void arch_perfmon_setup_counters( + eax.full = cpuid_eax(0xa); + + /* Workaround for BIOS bugs in 6/15. Taken from perfmon2 */ +- if (eax.split.version_id == 0 && __this_cpu_read(cpu_info.x86) == 6 && +- __this_cpu_read(cpu_info.x86_model) == 15) { ++ if (eax.split.version_id == 0 && boot_cpu_data.x86 == 6 && ++ boot_cpu_data.x86_model == 15) { + eax.split.version_id = 2; + eax.split.num_counters = 2; + eax.split.bit_width = 40;