All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] mmc: meson-gx: fix return value check of mmc_add_host()
@ 2022-11-08 12:34 ` Yang Yingliang
  0 siblings, 0 replies; 6+ messages in thread
From: Yang Yingliang @ 2022-11-08 12:34 UTC (permalink / raw)
  To: linux-mmc, linux-amlogic
  Cc: ulf.hansson, neil.armstrong, khilman, jbrunet,
	martin.blumenstingl, yangyingliang

mmc_add_host() may return error, if we ignore its return value,
it will lead two issues:
1. The memory that allocated in mmc_alloc_host() is leaked.
2. In the remove() path, mmc_remove_host() will be called to
   delete device, but it's not added yet, it will lead a kernel
   crash because of null-ptr-deref in device_del().

Fix this by checking the return value and goto error path which
will call mmc_free_host().

Fixes: 51c5d8447bd7 ("MMC: meson: initial support for GX platforms")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/mmc/host/meson-gx-mmc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
index df05e60bed9a..6e5ea0213b47 100644
--- a/drivers/mmc/host/meson-gx-mmc.c
+++ b/drivers/mmc/host/meson-gx-mmc.c
@@ -1335,7 +1335,9 @@ static int meson_mmc_probe(struct platform_device *pdev)
 	}
 
 	mmc->ops = &meson_mmc_ops;
-	mmc_add_host(mmc);
+	ret = mmc_add_host(mmc);
+	if (ret)
+		goto err_free_irq;
 
 	return 0;
 
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH] mmc: meson-gx: fix return value check of mmc_add_host()
@ 2022-11-08 12:34 ` Yang Yingliang
  0 siblings, 0 replies; 6+ messages in thread
From: Yang Yingliang @ 2022-11-08 12:34 UTC (permalink / raw)
  To: linux-mmc, linux-amlogic
  Cc: ulf.hansson, neil.armstrong, khilman, jbrunet,
	martin.blumenstingl, yangyingliang

mmc_add_host() may return error, if we ignore its return value,
it will lead two issues:
1. The memory that allocated in mmc_alloc_host() is leaked.
2. In the remove() path, mmc_remove_host() will be called to
   delete device, but it's not added yet, it will lead a kernel
   crash because of null-ptr-deref in device_del().

Fix this by checking the return value and goto error path which
will call mmc_free_host().

Fixes: 51c5d8447bd7 ("MMC: meson: initial support for GX platforms")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/mmc/host/meson-gx-mmc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
index df05e60bed9a..6e5ea0213b47 100644
--- a/drivers/mmc/host/meson-gx-mmc.c
+++ b/drivers/mmc/host/meson-gx-mmc.c
@@ -1335,7 +1335,9 @@ static int meson_mmc_probe(struct platform_device *pdev)
 	}
 
 	mmc->ops = &meson_mmc_ops;
-	mmc_add_host(mmc);
+	ret = mmc_add_host(mmc);
+	if (ret)
+		goto err_free_irq;
 
 	return 0;
 
-- 
2.25.1


_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH] mmc: meson-gx: fix return value check of mmc_add_host()
  2022-11-08 12:34 ` Yang Yingliang
@ 2022-11-09  9:46   ` neil.armstrong
  -1 siblings, 0 replies; 6+ messages in thread
From: neil.armstrong @ 2022-11-09  9:46 UTC (permalink / raw)
  To: Yang Yingliang, linux-mmc, linux-amlogic
  Cc: ulf.hansson, khilman, jbrunet, martin.blumenstingl

On 08/11/2022 13:34, Yang Yingliang wrote:
> mmc_add_host() may return error, if we ignore its return value,
> it will lead two issues:
> 1. The memory that allocated in mmc_alloc_host() is leaked.
> 2. In the remove() path, mmc_remove_host() will be called to
>     delete device, but it's not added yet, it will lead a kernel
>     crash because of null-ptr-deref in device_del().
> 
> Fix this by checking the return value and goto error path which
> will call mmc_free_host().
> 
> Fixes: 51c5d8447bd7 ("MMC: meson: initial support for GX platforms")
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
> ---
>   drivers/mmc/host/meson-gx-mmc.c | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
> index df05e60bed9a..6e5ea0213b47 100644
> --- a/drivers/mmc/host/meson-gx-mmc.c
> +++ b/drivers/mmc/host/meson-gx-mmc.c
> @@ -1335,7 +1335,9 @@ static int meson_mmc_probe(struct platform_device *pdev)
>   	}
>   
>   	mmc->ops = &meson_mmc_ops;
> -	mmc_add_host(mmc);
> +	ret = mmc_add_host(mmc);
> +	if (ret)
> +		goto err_free_irq;
>   
>   	return 0;
>   


Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] mmc: meson-gx: fix return value check of mmc_add_host()
@ 2022-11-09  9:46   ` neil.armstrong
  0 siblings, 0 replies; 6+ messages in thread
From: neil.armstrong @ 2022-11-09  9:46 UTC (permalink / raw)
  To: Yang Yingliang, linux-mmc, linux-amlogic
  Cc: ulf.hansson, khilman, jbrunet, martin.blumenstingl

On 08/11/2022 13:34, Yang Yingliang wrote:
> mmc_add_host() may return error, if we ignore its return value,
> it will lead two issues:
> 1. The memory that allocated in mmc_alloc_host() is leaked.
> 2. In the remove() path, mmc_remove_host() will be called to
>     delete device, but it's not added yet, it will lead a kernel
>     crash because of null-ptr-deref in device_del().
> 
> Fix this by checking the return value and goto error path which
> will call mmc_free_host().
> 
> Fixes: 51c5d8447bd7 ("MMC: meson: initial support for GX platforms")
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
> ---
>   drivers/mmc/host/meson-gx-mmc.c | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
> index df05e60bed9a..6e5ea0213b47 100644
> --- a/drivers/mmc/host/meson-gx-mmc.c
> +++ b/drivers/mmc/host/meson-gx-mmc.c
> @@ -1335,7 +1335,9 @@ static int meson_mmc_probe(struct platform_device *pdev)
>   	}
>   
>   	mmc->ops = &meson_mmc_ops;
> -	mmc_add_host(mmc);
> +	ret = mmc_add_host(mmc);
> +	if (ret)
> +		goto err_free_irq;
>   
>   	return 0;
>   


Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>

_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] mmc: meson-gx: fix return value check of mmc_add_host()
  2022-11-08 12:34 ` Yang Yingliang
@ 2022-11-09 12:34   ` Ulf Hansson
  -1 siblings, 0 replies; 6+ messages in thread
From: Ulf Hansson @ 2022-11-09 12:34 UTC (permalink / raw)
  To: Yang Yingliang
  Cc: linux-mmc, linux-amlogic, neil.armstrong, khilman, jbrunet,
	martin.blumenstingl

On Tue, 8 Nov 2022 at 13:35, Yang Yingliang <yangyingliang@huawei.com> wrote:
>
> mmc_add_host() may return error, if we ignore its return value,
> it will lead two issues:
> 1. The memory that allocated in mmc_alloc_host() is leaked.
> 2. In the remove() path, mmc_remove_host() will be called to
>    delete device, but it's not added yet, it will lead a kernel
>    crash because of null-ptr-deref in device_del().
>
> Fix this by checking the return value and goto error path which
> will call mmc_free_host().
>
> Fixes: 51c5d8447bd7 ("MMC: meson: initial support for GX platforms")
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

Applied for next, thanks!

Kind regards
Uffe


> ---
>  drivers/mmc/host/meson-gx-mmc.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
> index df05e60bed9a..6e5ea0213b47 100644
> --- a/drivers/mmc/host/meson-gx-mmc.c
> +++ b/drivers/mmc/host/meson-gx-mmc.c
> @@ -1335,7 +1335,9 @@ static int meson_mmc_probe(struct platform_device *pdev)
>         }
>
>         mmc->ops = &meson_mmc_ops;
> -       mmc_add_host(mmc);
> +       ret = mmc_add_host(mmc);
> +       if (ret)
> +               goto err_free_irq;
>
>         return 0;
>
> --
> 2.25.1
>

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] mmc: meson-gx: fix return value check of mmc_add_host()
@ 2022-11-09 12:34   ` Ulf Hansson
  0 siblings, 0 replies; 6+ messages in thread
From: Ulf Hansson @ 2022-11-09 12:34 UTC (permalink / raw)
  To: Yang Yingliang
  Cc: linux-mmc, linux-amlogic, neil.armstrong, khilman, jbrunet,
	martin.blumenstingl

On Tue, 8 Nov 2022 at 13:35, Yang Yingliang <yangyingliang@huawei.com> wrote:
>
> mmc_add_host() may return error, if we ignore its return value,
> it will lead two issues:
> 1. The memory that allocated in mmc_alloc_host() is leaked.
> 2. In the remove() path, mmc_remove_host() will be called to
>    delete device, but it's not added yet, it will lead a kernel
>    crash because of null-ptr-deref in device_del().
>
> Fix this by checking the return value and goto error path which
> will call mmc_free_host().
>
> Fixes: 51c5d8447bd7 ("MMC: meson: initial support for GX platforms")
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

Applied for next, thanks!

Kind regards
Uffe


> ---
>  drivers/mmc/host/meson-gx-mmc.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
> index df05e60bed9a..6e5ea0213b47 100644
> --- a/drivers/mmc/host/meson-gx-mmc.c
> +++ b/drivers/mmc/host/meson-gx-mmc.c
> @@ -1335,7 +1335,9 @@ static int meson_mmc_probe(struct platform_device *pdev)
>         }
>
>         mmc->ops = &meson_mmc_ops;
> -       mmc_add_host(mmc);
> +       ret = mmc_add_host(mmc);
> +       if (ret)
> +               goto err_free_irq;
>
>         return 0;
>
> --
> 2.25.1
>

_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-11-09 12:35 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-08 12:34 [PATCH] mmc: meson-gx: fix return value check of mmc_add_host() Yang Yingliang
2022-11-08 12:34 ` Yang Yingliang
2022-11-09  9:46 ` neil.armstrong
2022-11-09  9:46   ` neil.armstrong
2022-11-09 12:34 ` Ulf Hansson
2022-11-09 12:34   ` Ulf Hansson

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.