linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] mmc: sdio: fix kernel panic when remove non-standard SDIO card
@ 2022-09-27  2:01 Weizhao Ouyang
  2022-10-11 14:40 ` Ulf Hansson
  0 siblings, 1 reply; 6+ messages in thread
From: Weizhao Ouyang @ 2022-09-27  2:01 UTC (permalink / raw)
  To: Ulf Hansson, John Wang, Sergey Shtylyov, Matthew Ma,
	Weizhao Ouyang, Pierre Ossman
  Cc: linux-mmc, linux-kernel

From: Matthew Ma <mahongwei@zeku.com>

SDIO tuple is only allocated for standard SDIO card, especially it
causes memory corruption issues when the non-standard SDIO card has
removed since the card device's reference counter does not increase for
it at sdio_init_func(), but all SDIO card device reference counter has
decreased at sdio_release_func().

Fixes: 1a632f8cdc33 ("sdio: split up common and function CIS parsing")
Signed-off-by: Matthew Ma <mahongwei@zeku.com>
Reviewed-by: Weizhao Ouyang <ouyangweizhao@zeku.com>
Reviewed-by: John Wang <wangdayu@zeku.com>
---
 drivers/mmc/core/sdio_bus.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c
index c6268c38c69e..babf21a0adeb 100644
--- a/drivers/mmc/core/sdio_bus.c
+++ b/drivers/mmc/core/sdio_bus.c
@@ -291,7 +291,8 @@ static void sdio_release_func(struct device *dev)
 {
	struct sdio_func *func = dev_to_sdio_func(dev);
 
-	sdio_free_func_cis(func);
+	if (!(func->card->quirks & MMC_QUIRK_NONSTD_SDIO))
+		sdio_free_func_cis(func);
 
	kfree(func->info);
	kfree(func->tmpbuf);
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] mmc: sdio: fix kernel panic when remove non-standard SDIO card
  2022-09-27  2:01 [PATCH] mmc: sdio: fix kernel panic when remove non-standard SDIO card Weizhao Ouyang
@ 2022-10-11 14:40 ` Ulf Hansson
  0 siblings, 0 replies; 6+ messages in thread
From: Ulf Hansson @ 2022-10-11 14:40 UTC (permalink / raw)
  To: Weizhao Ouyang
  Cc: John Wang, Sergey Shtylyov, Matthew Ma, Pierre Ossman, linux-mmc,
	linux-kernel

On Tue, 27 Sept 2022 at 04:04, Weizhao Ouyang <ouyangweizhao@zeku.com> wrote:
>
> From: Matthew Ma <mahongwei@zeku.com>
>
> SDIO tuple is only allocated for standard SDIO card, especially it
> causes memory corruption issues when the non-standard SDIO card has
> removed since the card device's reference counter does not increase for
> it at sdio_init_func(), but all SDIO card device reference counter has
> decreased at sdio_release_func().
>
> Fixes: 1a632f8cdc33 ("sdio: split up common and function CIS parsing")
> Signed-off-by: Matthew Ma <mahongwei@zeku.com>
> Reviewed-by: Weizhao Ouyang <ouyangweizhao@zeku.com>
> Reviewed-by: John Wang <wangdayu@zeku.com>

Apologize for the delay!

Wow, that's a very old bug you fixed! However, it looks like the fixed
commit should be changed to 6f51be3d37df ("sdio: allow non-standard
SDIO cards").

I tried to apply the patch, but the patch format seems to be corrupt.
Did you use git format-patch and did run ./scripts/checkpatch.pl on
it?

Kind regards
Uffe

> ---
>  drivers/mmc/core/sdio_bus.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c
> index c6268c38c69e..babf21a0adeb 100644
> --- a/drivers/mmc/core/sdio_bus.c
> +++ b/drivers/mmc/core/sdio_bus.c
> @@ -291,7 +291,8 @@ static void sdio_release_func(struct device *dev)
>  {
>         struct sdio_func *func = dev_to_sdio_func(dev);
>
> -       sdio_free_func_cis(func);
> +       if (!(func->card->quirks & MMC_QUIRK_NONSTD_SDIO))
> +               sdio_free_func_cis(func);
>
>         kfree(func->info);
>         kfree(func->tmpbuf);
> --
> 2.25.1
>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* RE: [PATCH] mmc: sdio: fix kernel panic when remove non-standard SDIO card
  2022-10-12 10:09 ` Ulf Hansson
@ 2022-10-14  2:39   ` 欧阳炜钊(Weizhao Ouyang)
  0 siblings, 0 replies; 6+ messages in thread
From: 欧阳炜钊(Weizhao Ouyang) @ 2022-10-14  2:39 UTC (permalink / raw)
  To: Ulf Hansson
  Cc: 王大宇(John Wang),
	Sergey Shtylyov, 马宏伟(Matthew Ma),
	Pierre Ossman, linux-mmc, linux-kernel

Wednesday, October 12, 2022 6:09 PM, Ulf Hansson <ulf.hansson@linaro.org> wrote:
>
> On Wed, 12 Oct 2022 at 03:50, 欧阳炜钊(Weizhao Ouyang)
> <ouyangweizhao@zeku.com> wrote:
> >
> > 2022年10月11日 22:41, Ulf Hansson <ulf.hansson@linaro.org> wrote:
> > >
> > > On Tue, 27 Sept 2022 at 04:04, Weizhao Ouyang
> <ouyangweizhao@zeku.com>
> > > wrote:
> > > >
> > > > From: Matthew Ma <mahongwei@zeku.com>
> > > >
> > > > SDIO tuple is only allocated for standard SDIO card, especially it
> > > > causes memory corruption issues when the non-standard SDIO card has
> > > > removed since the card device's reference counter does not increase for
> > > > it at sdio_init_func(), but all SDIO card device reference counter has
> > > > decreased at sdio_release_func().
> > > >
> > > > Fixes: 1a632f8cdc33 ("sdio: split up common and function CIS parsing")
> > > > Signed-off-by: Matthew Ma <mahongwei@zeku.com>
> > > > Reviewed-by: Weizhao Ouyang <ouyangweizhao@zeku.com>
> > > > Reviewed-by: John Wang <wangdayu@zeku.com>
> > >
> > > Apologize for the delay!
> > >
> > > Wow, that's a very old bug you fixed! However, it looks like the fixed
> > > commit should be changed to 6f51be3d37df ("sdio: allow non-standard
> > > SDIO cards").
> >
> > Thanks, I messed the tag.
> >
> > >
> > > I tried to apply the patch, but the patch format seems to be corrupt.
> > > Did you use git format-patch and did run ./scripts/checkpatch.pl on
> > > it?
> > >
> >
> > Yeah I used checkpatch.pl with strict mode to check this patch, and it
> > has no obvious style problems. What's the format error you got?
> 
> ERROR: patch seems to be corrupt (line wrapped?)
> #130: FILE: drivers/mmc/core/sdio_bus.c:291:
> struct sdio_func *func = dev_to_sdio_func(dev);
> 
> total: 1 errors, 0 warnings, 9 lines checked
> 

Sorry our email hosting service made some issue on formatting, I will
send an updated patch ASAP.

Thanks,
Weizhao


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] mmc: sdio: fix kernel panic when remove non-standard SDIO card
@ 2022-10-14  2:22 欧阳炜钊(Weizhao Ouyang)
  0 siblings, 0 replies; 6+ messages in thread
From: 欧阳炜钊(Weizhao Ouyang) @ 2022-10-14  2:22 UTC (permalink / raw)
  To: Ulf Hansson, 王大宇(John Wang),
	Sergey Shtylyov, 马宏伟(Matthew Ma),
	Pierre Ossman, linux-mmc, linux-kernel

2022年10月12日 18:09, Ulf Hansson <ulf.hansson@linaro.org> wrote:
> 
> On Wed, 12 Oct 2022 at 03:50, 欧阳炜钊(Weizhao Ouyang)
> <ouyangweizhao@zeku.com> wrote:
> >
> > 2022年10月11日 22:41, Ulf Hansson <ulf.hansson@linaro.org> wrote:
> > >
> > > On Tue, 27 Sept 2022 at 04:04, Weizhao Ouyang
> <ouyangweizhao@zeku.com>
> > > wrote:
> > > >
> > > > From: Matthew Ma <mahongwei@zeku.com>
> > > >
> > > > SDIO tuple is only allocated for standard SDIO card, especially it
> > > > causes memory corruption issues when the non-standard SDIO card has
> > > > removed since the card device's reference counter does not increase for
> > > > it at sdio_init_func(), but all SDIO card device reference counter has
> > > > decreased at sdio_release_func().
> > > >
> > > > Fixes: 1a632f8cdc33 ("sdio: split up common and function CIS parsing")
> > > > Signed-off-by: Matthew Ma <mahongwei@zeku.com>
> > > > Reviewed-by: Weizhao Ouyang <ouyangweizhao@zeku.com>
> > > > Reviewed-by: John Wang <wangdayu@zeku.com>
> > >
> > > Apologize for the delay!
> > >
> > > Wow, that's a very old bug you fixed! However, it looks like the fixed
> > > commit should be changed to 6f51be3d37df ("sdio: allow non-standard
> > > SDIO cards").
> >
> > Thanks, I messed the tag.
> >
> > >
> > > I tried to apply the patch, but the patch format seems to be corrupt.
> > > Did you use git format-patch and did run ./scripts/checkpatch.pl on
> > > it?
> > >
> >
> > Yeah I used checkpatch.pl with strict mode to check this patch, and it
> > has no obvious style problems. What's the format error you got?
> 
> ERROR: patch seems to be corrupt (line wrapped?)
> #130: FILE: drivers/mmc/core/sdio_bus.c:291:
> struct sdio_func *func = dev_to_sdio_func(dev);
> 
> total: 1 errors, 0 warnings, 9 lines checked
> 

Sorry our email hosting service made some issue on formatting, I will
send an updated patch ASAP.

Thanks,
Weizhao


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] mmc: sdio: fix kernel panic when remove non-standard SDIO card
  2022-10-12  1:50 欧阳炜钊(Weizhao Ouyang)
@ 2022-10-12 10:09 ` Ulf Hansson
  2022-10-14  2:39   ` 欧阳炜钊(Weizhao Ouyang)
  0 siblings, 1 reply; 6+ messages in thread
From: Ulf Hansson @ 2022-10-12 10:09 UTC (permalink / raw)
  To: 欧阳炜钊(Weizhao Ouyang)
  Cc: 王大宇(John Wang),
	Sergey Shtylyov, 马宏伟(Matthew Ma),
	Pierre Ossman, linux-mmc, linux-kernel

On Wed, 12 Oct 2022 at 03:50, 欧阳炜钊(Weizhao Ouyang)
<ouyangweizhao@zeku.com> wrote:
>
> 2022年10月11日 22:41, Ulf Hansson <ulf.hansson@linaro.org> wrote:
> >
> > On Tue, 27 Sept 2022 at 04:04, Weizhao Ouyang <ouyangweizhao@zeku.com>
> > wrote:
> > >
> > > From: Matthew Ma <mahongwei@zeku.com>
> > >
> > > SDIO tuple is only allocated for standard SDIO card, especially it
> > > causes memory corruption issues when the non-standard SDIO card has
> > > removed since the card device's reference counter does not increase for
> > > it at sdio_init_func(), but all SDIO card device reference counter has
> > > decreased at sdio_release_func().
> > >
> > > Fixes: 1a632f8cdc33 ("sdio: split up common and function CIS parsing")
> > > Signed-off-by: Matthew Ma <mahongwei@zeku.com>
> > > Reviewed-by: Weizhao Ouyang <ouyangweizhao@zeku.com>
> > > Reviewed-by: John Wang <wangdayu@zeku.com>
> >
> > Apologize for the delay!
> >
> > Wow, that's a very old bug you fixed! However, it looks like the fixed
> > commit should be changed to 6f51be3d37df ("sdio: allow non-standard
> > SDIO cards").
>
> Thanks, I messed the tag.
>
> >
> > I tried to apply the patch, but the patch format seems to be corrupt.
> > Did you use git format-patch and did run ./scripts/checkpatch.pl on
> > it?
> >
>
> Yeah I used checkpatch.pl with strict mode to check this patch, and it
> has no obvious style problems. What's the format error you got?

ERROR: patch seems to be corrupt (line wrapped?)
#130: FILE: drivers/mmc/core/sdio_bus.c:291:
struct sdio_func *func = dev_to_sdio_func(dev);

total: 1 errors, 0 warnings, 9 lines checked

If you haven't read the submitting-patches guidelines [1], I strongly
recommend you to have a look.
For example, it explains why you should use git send-email, if you
aren't doing that already.

Kind regards
Uffe

[1]
https://www.kernel.org/doc/html/v6.0/process/submitting-patches.html

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] mmc: sdio: fix kernel panic when remove non-standard SDIO card
@ 2022-10-12  1:50 欧阳炜钊(Weizhao Ouyang)
  2022-10-12 10:09 ` Ulf Hansson
  0 siblings, 1 reply; 6+ messages in thread
From: 欧阳炜钊(Weizhao Ouyang) @ 2022-10-12  1:50 UTC (permalink / raw)
  To: Ulf Hansson
  Cc: 王大宇(John Wang),
	Sergey Shtylyov, 马宏伟(Matthew Ma),
	Pierre Ossman, linux-mmc, linux-kernel

2022年10月11日 22:41, Ulf Hansson <ulf.hansson@linaro.org> wrote:
> 
> On Tue, 27 Sept 2022 at 04:04, Weizhao Ouyang <ouyangweizhao@zeku.com>
> wrote:
> >
> > From: Matthew Ma <mahongwei@zeku.com>
> >
> > SDIO tuple is only allocated for standard SDIO card, especially it
> > causes memory corruption issues when the non-standard SDIO card has
> > removed since the card device's reference counter does not increase for
> > it at sdio_init_func(), but all SDIO card device reference counter has
> > decreased at sdio_release_func().
> >
> > Fixes: 1a632f8cdc33 ("sdio: split up common and function CIS parsing")
> > Signed-off-by: Matthew Ma <mahongwei@zeku.com>
> > Reviewed-by: Weizhao Ouyang <ouyangweizhao@zeku.com>
> > Reviewed-by: John Wang <wangdayu@zeku.com>
> 
> Apologize for the delay!
> 
> Wow, that's a very old bug you fixed! However, it looks like the fixed
> commit should be changed to 6f51be3d37df ("sdio: allow non-standard
> SDIO cards").

Thanks, I messed the tag.

> 
> I tried to apply the patch, but the patch format seems to be corrupt.
> Did you use git format-patch and did run ./scripts/checkpatch.pl on
> it?
> 

Yeah I used checkpatch.pl with strict mode to check this patch, and it
has no obvious style problems. What's the format error you got?

Thanks,
Weizhao


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2022-10-14  2:39 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-27  2:01 [PATCH] mmc: sdio: fix kernel panic when remove non-standard SDIO card Weizhao Ouyang
2022-10-11 14:40 ` Ulf Hansson
2022-10-12  1:50 欧阳炜钊(Weizhao Ouyang)
2022-10-12 10:09 ` Ulf Hansson
2022-10-14  2:39   ` 欧阳炜钊(Weizhao Ouyang)
2022-10-14  2:22 欧阳炜钊(Weizhao Ouyang)

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).