* [PATCH 1/1] MMC: meson: avoid possible NULL dereference
@ 2016-12-23 15:01 Heinrich Schuchardt
2017-01-06 17:01 ` Kevin Hilman
0 siblings, 1 reply; 3+ messages in thread
From: Heinrich Schuchardt @ 2016-12-23 15:01 UTC (permalink / raw)
To: Ulf Hansson, Carlo Caione, Kevin Hilman
Cc: linux-mmc, linux-arm-kernel, linux-amlogic, linux-kernel,
Heinrich Schuchardt
No actual segmentation faults were observed but the coding is
at least inconsistent.
irqreturn_t meson_mmc_irq():
We should not dereference host before checking it.
meson_mmc_irq_thread():
If cmd or mrq are NULL we should not dereference them after
writing a warning.
Fixes: 51c5d8447bd7 MMC: meson: initial support for GX platforms
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---
drivers/mmc/host/meson-gx-mmc.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
index b352760c041e..09739352834c 100644
--- a/drivers/mmc/host/meson-gx-mmc.c
+++ b/drivers/mmc/host/meson-gx-mmc.c
@@ -578,13 +578,15 @@ static irqreturn_t meson_mmc_irq(int irq, void *dev_id)
{
struct meson_host *host = dev_id;
struct mmc_request *mrq;
- struct mmc_command *cmd = host->cmd;
+ struct mmc_command *cmd;
u32 irq_en, status, raw_status;
irqreturn_t ret = IRQ_HANDLED;
if (WARN_ON(!host))
return IRQ_NONE;
+ cmd = host->cmd;
+
mrq = host->mrq;
if (WARN_ON(!mrq))
@@ -670,10 +672,10 @@ static irqreturn_t meson_mmc_irq_thread(int irq, void *dev_id)
int ret = IRQ_HANDLED;
if (WARN_ON(!mrq))
- ret = IRQ_NONE;
+ return IRQ_NONE;
if (WARN_ON(!cmd))
- ret = IRQ_NONE;
+ return IRQ_NONE;
data = cmd->data;
if (data) {
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 1/1] MMC: meson: avoid possible NULL dereference
2016-12-23 15:01 [PATCH 1/1] MMC: meson: avoid possible NULL dereference Heinrich Schuchardt
@ 2017-01-06 17:01 ` Kevin Hilman
2017-01-10 15:38 ` Ulf Hansson
0 siblings, 1 reply; 3+ messages in thread
From: Kevin Hilman @ 2017-01-06 17:01 UTC (permalink / raw)
To: Heinrich Schuchardt
Cc: Ulf Hansson, Carlo Caione, linux-mmc, linux-arm-kernel,
linux-amlogic, linux-kernel
Heinrich Schuchardt <xypron.glpk@gmx.de> writes:
> No actual segmentation faults were observed but the coding is
> at least inconsistent.
>
> irqreturn_t meson_mmc_irq():
>
> We should not dereference host before checking it.
>
> meson_mmc_irq_thread():
>
> If cmd or mrq are NULL we should not dereference them after
> writing a warning.
>
> Fixes: 51c5d8447bd7 MMC: meson: initial support for GX platforms
> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Acked-by: Kevin Hilman <khilman@baylibre.com>
Ulf, I assume you can pick this up directly for v4.10-rc?
Thanks,
Kevin
> ---
> drivers/mmc/host/meson-gx-mmc.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
> index b352760c041e..09739352834c 100644
> --- a/drivers/mmc/host/meson-gx-mmc.c
> +++ b/drivers/mmc/host/meson-gx-mmc.c
> @@ -578,13 +578,15 @@ static irqreturn_t meson_mmc_irq(int irq, void *dev_id)
> {
> struct meson_host *host = dev_id;
> struct mmc_request *mrq;
> - struct mmc_command *cmd = host->cmd;
> + struct mmc_command *cmd;
> u32 irq_en, status, raw_status;
> irqreturn_t ret = IRQ_HANDLED;
>
> if (WARN_ON(!host))
> return IRQ_NONE;
>
> + cmd = host->cmd;
> +
> mrq = host->mrq;
>
> if (WARN_ON(!mrq))
> @@ -670,10 +672,10 @@ static irqreturn_t meson_mmc_irq_thread(int irq, void *dev_id)
> int ret = IRQ_HANDLED;
>
> if (WARN_ON(!mrq))
> - ret = IRQ_NONE;
> + return IRQ_NONE;
>
> if (WARN_ON(!cmd))
> - ret = IRQ_NONE;
> + return IRQ_NONE;
>
> data = cmd->data;
> if (data) {
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 1/1] MMC: meson: avoid possible NULL dereference
2017-01-06 17:01 ` Kevin Hilman
@ 2017-01-10 15:38 ` Ulf Hansson
0 siblings, 0 replies; 3+ messages in thread
From: Ulf Hansson @ 2017-01-10 15:38 UTC (permalink / raw)
To: Kevin Hilman, Heinrich Schuchardt
Cc: Carlo Caione, linux-mmc@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-amlogic,
linux-kernel@vger.kernel.org
On 6 January 2017 at 18:01, Kevin Hilman <khilman@baylibre.com> wrote:
> Heinrich Schuchardt <xypron.glpk@gmx.de> writes:
>
>> No actual segmentation faults were observed but the coding is
>> at least inconsistent.
>>
>> irqreturn_t meson_mmc_irq():
>>
>> We should not dereference host before checking it.
>>
>> meson_mmc_irq_thread():
>>
>> If cmd or mrq are NULL we should not dereference them after
>> writing a warning.
>>
>> Fixes: 51c5d8447bd7 MMC: meson: initial support for GX platforms
>> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
>
> Acked-by: Kevin Hilman <khilman@baylibre.com>
>
> Ulf, I assume you can pick this up directly for v4.10-rc?
Thanks, applied for fixes!
Kind regards
Uffe
>
> Thanks,
>
> Kevin
>
>> ---
>> drivers/mmc/host/meson-gx-mmc.c | 8 +++++---
>> 1 file changed, 5 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
>> index b352760c041e..09739352834c 100644
>> --- a/drivers/mmc/host/meson-gx-mmc.c
>> +++ b/drivers/mmc/host/meson-gx-mmc.c
>> @@ -578,13 +578,15 @@ static irqreturn_t meson_mmc_irq(int irq, void *dev_id)
>> {
>> struct meson_host *host = dev_id;
>> struct mmc_request *mrq;
>> - struct mmc_command *cmd = host->cmd;
>> + struct mmc_command *cmd;
>> u32 irq_en, status, raw_status;
>> irqreturn_t ret = IRQ_HANDLED;
>>
>> if (WARN_ON(!host))
>> return IRQ_NONE;
>>
>> + cmd = host->cmd;
>> +
>> mrq = host->mrq;
>>
>> if (WARN_ON(!mrq))
>> @@ -670,10 +672,10 @@ static irqreturn_t meson_mmc_irq_thread(int irq, void *dev_id)
>> int ret = IRQ_HANDLED;
>>
>> if (WARN_ON(!mrq))
>> - ret = IRQ_NONE;
>> + return IRQ_NONE;
>>
>> if (WARN_ON(!cmd))
>> - ret = IRQ_NONE;
>> + return IRQ_NONE;
>>
>> data = cmd->data;
>> if (data) {
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-01-10 15:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-23 15:01 [PATCH 1/1] MMC: meson: avoid possible NULL dereference Heinrich Schuchardt
2017-01-06 17:01 ` Kevin Hilman
2017-01-10 15:38 ` Ulf Hansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox