* [PATCH] platform/x86: sony-laptop: Fix unintentional fall-through
@ 2019-04-24 18:09 Gustavo A. R. Silva
2019-05-01 20:40 ` Gustavo A. R. Silva
2019-05-01 21:09 ` Kees Cook
0 siblings, 2 replies; 5+ messages in thread
From: Gustavo A. R. Silva @ 2019-04-24 18:09 UTC (permalink / raw)
To: Mattia Dongili, Darren Hart, Andy Shevchenko
Cc: platform-driver-x86, linux-kernel, Gustavo A. R. Silva
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 <gustavo@embeddedor.com>
---
drivers/platform/x86/sony-laptop.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index 4bfbfa3f78e6..2058445fc456 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -4424,14 +4424,16 @@ sony_pic_read_possible_resource(struct acpi_resource *resource, void *context)
}
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)
--
2.21.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] platform/x86: sony-laptop: Fix unintentional fall-through
2019-04-24 18:09 [PATCH] platform/x86: sony-laptop: Fix unintentional fall-through Gustavo A. R. Silva
@ 2019-05-01 20:40 ` Gustavo A. R. Silva
2019-05-06 12:23 ` Andy Shevchenko
2019-05-01 21:09 ` Kees Cook
1 sibling, 1 reply; 5+ messages in thread
From: Gustavo A. R. Silva @ 2019-05-01 20:40 UTC (permalink / raw)
To: Mattia Dongili, Darren Hart, Andy Shevchenko
Cc: platform-driver-x86, linux-kernel, Kees Cook
Hi all,
Friendly ping:
Who can take this?
Thanks
--
Gustavo
On 4/24/19 1:09 PM, Gustavo A. R. Silva wrote:
> 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 <gustavo@embeddedor.com>
> ---
> drivers/platform/x86/sony-laptop.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
> index 4bfbfa3f78e6..2058445fc456 100644
> --- a/drivers/platform/x86/sony-laptop.c
> +++ b/drivers/platform/x86/sony-laptop.c
> @@ -4424,14 +4424,16 @@ sony_pic_read_possible_resource(struct acpi_resource *resource, void *context)
> }
> 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)
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] platform/x86: sony-laptop: Fix unintentional fall-through
2019-05-01 20:40 ` Gustavo A. R. Silva
@ 2019-05-06 12:23 ` Andy Shevchenko
2019-05-06 21:35 ` Gustavo A. R. Silva
0 siblings, 1 reply; 5+ messages in thread
From: Andy Shevchenko @ 2019-05-06 12:23 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: Mattia Dongili, Darren Hart, Andy Shevchenko, Platform Driver,
Linux Kernel Mailing List, Kees Cook
On Wed, May 1, 2019 at 11:42 PM Gustavo A. R. Silva
<gustavo@embeddedor.com> wrote:
>
> Hi all,
>
> Friendly ping:
>
> Who can take this?
Pushed to my review and testing queue, thanks!
>
> Thanks
> --
> Gustavo
>
> On 4/24/19 1:09 PM, Gustavo A. R. Silva wrote:
> > 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 <gustavo@embeddedor.com>
> > ---
> > drivers/platform/x86/sony-laptop.c | 8 +++++---
> > 1 file changed, 5 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
> > index 4bfbfa3f78e6..2058445fc456 100644
> > --- a/drivers/platform/x86/sony-laptop.c
> > +++ b/drivers/platform/x86/sony-laptop.c
> > @@ -4424,14 +4424,16 @@ sony_pic_read_possible_resource(struct acpi_resource *resource, void *context)
> > }
> > 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)
> >
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] platform/x86: sony-laptop: Fix unintentional fall-through
2019-05-06 12:23 ` Andy Shevchenko
@ 2019-05-06 21:35 ` Gustavo A. R. Silva
0 siblings, 0 replies; 5+ messages in thread
From: Gustavo A. R. Silva @ 2019-05-06 21:35 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Mattia Dongili, Darren Hart, Andy Shevchenko, Platform Driver,
Linux Kernel Mailing List, Kees Cook
On 5/6/19 7:23 AM, Andy Shevchenko wrote:
> On Wed, May 1, 2019 at 11:42 PM Gustavo A. R. Silva
> <gustavo@embeddedor.com> wrote:
>>
>> Hi all,
>>
>> Friendly ping:
>>
>> Who can take this?
>
> Pushed to my review and testing queue, thanks!
>
Awesome. :)
Thanks, Andy.
--
Gustavo
>
>>
>> Thanks
>> --
>> Gustavo
>>
>> On 4/24/19 1:09 PM, Gustavo A. R. Silva wrote:
>>> 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 <gustavo@embeddedor.com>
>>> ---
>>> drivers/platform/x86/sony-laptop.c | 8 +++++---
>>> 1 file changed, 5 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
>>> index 4bfbfa3f78e6..2058445fc456 100644
>>> --- a/drivers/platform/x86/sony-laptop.c
>>> +++ b/drivers/platform/x86/sony-laptop.c
>>> @@ -4424,14 +4424,16 @@ sony_pic_read_possible_resource(struct acpi_resource *resource, void *context)
>>> }
>>> 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)
>>>
>
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] platform/x86: sony-laptop: Fix unintentional fall-through
2019-04-24 18:09 [PATCH] platform/x86: sony-laptop: Fix unintentional fall-through Gustavo A. R. Silva
2019-05-01 20:40 ` Gustavo A. R. Silva
@ 2019-05-01 21:09 ` Kees Cook
1 sibling, 0 replies; 5+ messages in thread
From: Kees Cook @ 2019-05-01 21:09 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: Mattia Dongili, Darren Hart, Andy Shevchenko, Platform Driver, LKML
On Wed, Apr 24, 2019 at 11:09 AM Gustavo A. R. Silva
<gustavo@embeddedor.com> wrote:
>
> 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 <gustavo@embeddedor.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
-Kees
> ---
> drivers/platform/x86/sony-laptop.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
> index 4bfbfa3f78e6..2058445fc456 100644
> --- a/drivers/platform/x86/sony-laptop.c
> +++ b/drivers/platform/x86/sony-laptop.c
> @@ -4424,14 +4424,16 @@ sony_pic_read_possible_resource(struct acpi_resource *resource, void *context)
> }
> 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)
> --
> 2.21.0
>
--
Kees Cook
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-05-06 21:35 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-24 18:09 [PATCH] platform/x86: sony-laptop: Fix unintentional fall-through Gustavo A. R. Silva
2019-05-01 20:40 ` Gustavo A. R. Silva
2019-05-06 12:23 ` Andy Shevchenko
2019-05-06 21:35 ` Gustavo A. R. Silva
2019-05-01 21:09 ` Kees Cook
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).