From 2f4b1eee4ddcdf4087acf6b29a7101e066e54ae7 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 8 Mar 2018 09:37:55 -0800 Subject: [PATCH] 4.4-stable patches added patches: revert-led-core-fix-brightness-setting-when-setting-delay_off-0.patch x86-spectre-fix-an-error-message.patch --- ...ess-setting-when-setting-delay_off-0.patch | 35 +++++++++++++++ queue-4.4/series | 2 + .../x86-spectre-fix-an-error-message.patch | 44 +++++++++++++++++++ 3 files changed, 81 insertions(+) create mode 100644 queue-4.4/revert-led-core-fix-brightness-setting-when-setting-delay_off-0.patch create mode 100644 queue-4.4/x86-spectre-fix-an-error-message.patch diff --git a/queue-4.4/revert-led-core-fix-brightness-setting-when-setting-delay_off-0.patch b/queue-4.4/revert-led-core-fix-brightness-setting-when-setting-delay_off-0.patch new file mode 100644 index 00000000000..d6e393cb388 --- /dev/null +++ b/queue-4.4/revert-led-core-fix-brightness-setting-when-setting-delay_off-0.patch @@ -0,0 +1,35 @@ +From ben.hutchings@codethink.co.uk Thu Mar 8 09:31:04 2018 +From: Ben Hutchings +Date: Thu, 8 Mar 2018 15:59:07 +0000 +Subject: Revert "led: core: Fix brightness setting when setting delay_off=0" +To: Greg Kroah-Hartman +Cc: Jacek Anaszewski , Matthieu CASTET , stable@vger.kernel.org +Message-ID: <20180308155906.5zaldlnuxvxmh2wo@xylophone.i.decadent.org.uk> +Content-Disposition: inline + +From: Ben Hutchings + +This reverts commit 20ac8f72514b3af8b62c520d55656ded865eff00, which +was commit 2b83ff96f51d0b039c4561b9f95c824d7bddb85c upstream. +The bug that it should fix was only introduced in Linux 4.7, and +in 4.4 it causes a regression. + +Reported-by: Jacek Anaszewski +Cc: Matthieu CASTET +Signed-off-by: Ben Hutchings +Signed-off-by: Greg Kroah-Hartman +--- + drivers/leds/led-core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/leds/led-core.c ++++ b/drivers/leds/led-core.c +@@ -149,7 +149,7 @@ void led_blink_set(struct led_classdev * + unsigned long *delay_on, + unsigned long *delay_off) + { +- led_stop_software_blink(led_cdev); ++ del_timer_sync(&led_cdev->blink_timer); + + led_cdev->flags &= ~LED_BLINK_ONESHOT; + led_cdev->flags &= ~LED_BLINK_ONESHOT_STOP; diff --git a/queue-4.4/series b/queue-4.4/series index 0d799bd6ec5..abe73597be5 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -13,3 +13,5 @@ btrfs-don-t-clear-sgid-when-inheriting-acls.patch arm-dts-logicpd-torpedo-fix-i2c1-pinmux.patch x86-apic-vector-handle-legacy-irq-data-correctly.patch leds-do-not-overflow-sysfs-buffer-in-led_trigger_show.patch +x86-spectre-fix-an-error-message.patch +revert-led-core-fix-brightness-setting-when-setting-delay_off-0.patch diff --git a/queue-4.4/x86-spectre-fix-an-error-message.patch b/queue-4.4/x86-spectre-fix-an-error-message.patch new file mode 100644 index 00000000000..54b26c803d9 --- /dev/null +++ b/queue-4.4/x86-spectre-fix-an-error-message.patch @@ -0,0 +1,44 @@ +From 9de29eac8d2189424d81c0d840cd0469aa3d41c8 Mon Sep 17 00:00:00 2001 +From: Dan Carpenter +Date: Wed, 14 Feb 2018 10:14:17 +0300 +Subject: x86/spectre: Fix an error message + +From: Dan Carpenter + +commit 9de29eac8d2189424d81c0d840cd0469aa3d41c8 upstream. + +If i == ARRAY_SIZE(mitigation_options) then we accidentally print +garbage from one space beyond the end of the mitigation_options[] array. + +Signed-off-by: Dan Carpenter +Cc: Andy Lutomirski +Cc: Borislav Petkov +Cc: David Woodhouse +Cc: Greg Kroah-Hartman +Cc: KarimAllah Ahmed +Cc: Linus Torvalds +Cc: Peter Zijlstra +Cc: Thomas Gleixner +Cc: kernel-janitors@vger.kernel.org +Fixes: 9005c6834c0f ("x86/spectre: Simplify spectre_v2 command line parsing") +Link: http://lkml.kernel.org/r/20180214071416.GA26677@mwanda +Signed-off-by: Ingo Molnar +Cc: Ben Hutchings +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/kernel/cpu/bugs.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/arch/x86/kernel/cpu/bugs.c ++++ b/arch/x86/kernel/cpu/bugs.c +@@ -175,8 +175,7 @@ static enum spectre_v2_mitigation_cmd __ + } + + if (i >= ARRAY_SIZE(mitigation_options)) { +- pr_err("unknown option (%s). Switching to AUTO select\n", +- mitigation_options[i].option); ++ pr_err("unknown option (%s). Switching to AUTO select\n", arg); + return SPECTRE_V2_CMD_AUTO; + } + } -- 2.47.3