From: Greg Kroah-Hartman Date: Mon, 13 May 2019 07:46:15 +0000 (+0200) Subject: 3.18-stable patches X-Git-Tag: v5.1.2~41 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd06b36097015ccd5f58190343270ce22a7b383e;p=thirdparty%2Fkernel%2Fstable-queue.git 3.18-stable patches added patches: platform-x86-sony-laptop-fix-unintentional-fall-through.patch --- diff --git a/queue-3.18/platform-x86-sony-laptop-fix-unintentional-fall-through.patch b/queue-3.18/platform-x86-sony-laptop-fix-unintentional-fall-through.patch new file mode 100644 index 00000000000..68dc75b8a87 --- /dev/null +++ b/queue-3.18/platform-x86-sony-laptop-fix-unintentional-fall-through.patch @@ -0,0 +1,53 @@ +From 1cbd7a64959d33e7a2a1fa2bf36a62b350a9fcbd Mon Sep 17 00:00:00 2001 +From: "Gustavo A. R. Silva" +Date: Wed, 24 Apr 2019 13:09:34 -0500 +Subject: platform/x86: sony-laptop: Fix unintentional fall-through + +From: Gustavo A. R. Silva + +commit 1cbd7a64959d33e7a2a1fa2bf36a62b350a9fcbd upstream. + +It seems that the default case should return AE_CTRL_TERMINATE, instead +of falling through to case ACPI_RESOURCE_TYPE_END_TAG and returning AE_OK; +otherwise the line of code at the end of the function is unreachable and +makes no sense: + +return AE_CTRL_TERMINATE; + +This fix is based on the following thread of discussion: + +https://lore.kernel.org/patchwork/patch/959782/ + +Fixes: 33a04454527e ("sony-laptop: Add SNY6001 device handling (sonypi reimplementation)") +Cc: stable@vger.kernel.org +Signed-off-by: Gustavo A. R. Silva +Reviewed-by: Kees Cook +Signed-off-by: Andy Shevchenko +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/platform/x86/sony-laptop.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +--- a/drivers/platform/x86/sony-laptop.c ++++ b/drivers/platform/x86/sony-laptop.c +@@ -4399,14 +4399,16 @@ sony_pic_read_possible_resource(struct a + } + return AE_OK; + } ++ ++ case ACPI_RESOURCE_TYPE_END_TAG: ++ return AE_OK; ++ + default: + dprintk("Resource %d isn't an IRQ nor an IO port\n", + resource->type); ++ return AE_CTRL_TERMINATE; + +- case ACPI_RESOURCE_TYPE_END_TAG: +- return AE_OK; + } +- return AE_CTRL_TERMINATE; + } + + static int sony_pic_possible_resources(struct acpi_device *device) diff --git a/queue-3.18/series b/queue-3.18/series index 867e38a86fb..fd366eda250 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -61,3 +61,4 @@ bluetooth-hidp-fix-buffer-overflow.patch bluetooth-align-minimum-encryption-key-size-for-le-and-br-edr-connections.patch timer-debug-change-proc-timer_stats-from-0644-to-0600.patch netfilter-compat-initialize-all-fields-in-xt_init.patch +platform-x86-sony-laptop-fix-unintentional-fall-through.patch