* [PATCH v1] net: macb: fix use after free on rmmod
@ 2021-09-07 20:29 Tong Zhang
2021-09-08 7:27 ` Nicolas.Ferre
0 siblings, 1 reply; 6+ messages in thread
From: Tong Zhang @ 2021-09-07 20:29 UTC (permalink / raw)
To: Nicolas Ferre, Claudiu Beznea, David S. Miller, Jakub Kicinski,
netdev, linux-kernel
Cc: Tong Zhang
plat_dev->dev->platform_data is released by platform_device_unregister(),
use of pclk and hclk is use after free. This patch keeps a copy to fix
the issue.
[ 31.261225] BUG: KASAN: use-after-free in macb_remove+0x77/0xc6 [macb_pci]
[ 31.275563] Freed by task 306:
[ 30.276782] platform_device_release+0x25/0x80
Signed-off-by: Tong Zhang <ztong0001@gmail.com>
---
drivers/net/ethernet/cadence/macb_pci.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/cadence/macb_pci.c b/drivers/net/ethernet/cadence/macb_pci.c
index 8b7b59908a1a..4dd0cec2e542 100644
--- a/drivers/net/ethernet/cadence/macb_pci.c
+++ b/drivers/net/ethernet/cadence/macb_pci.c
@@ -110,10 +110,12 @@ static void macb_remove(struct pci_dev *pdev)
{
struct platform_device *plat_dev = pci_get_drvdata(pdev);
struct macb_platform_data *plat_data = dev_get_platdata(&plat_dev->dev);
+ struct clk *pclk = plat_data->pclk;
+ struct clk *hclk = plat_data->hclk;
platform_device_unregister(plat_dev);
- clk_unregister(plat_data->pclk);
- clk_unregister(plat_data->hclk);
+ clk_unregister(pclk);
+ clk_unregister(hclk);
}
static const struct pci_device_id dev_id_table[] = {
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v1] net: macb: fix use after free on rmmod
2021-09-07 20:29 [PATCH v1] net: macb: fix use after free on rmmod Tong Zhang
@ 2021-09-08 7:27 ` Nicolas.Ferre
2021-09-08 19:02 ` [PATCH v2] " Tong Zhang
2021-09-08 19:02 ` [PATCH v1] " Tong Zhang
0 siblings, 2 replies; 6+ messages in thread
From: Nicolas.Ferre @ 2021-09-08 7:27 UTC (permalink / raw)
To: ztong0001, Claudiu.Beznea, davem, kuba, netdev, linux-kernel
On 07/09/2021 at 22:29, Tong Zhang wrote:
> plat_dev->dev->platform_data is released by platform_device_unregister(),
> use of pclk and hclk is use after free. This patch keeps a copy to fix
> the issue.
>
> [ 31.261225] BUG: KASAN: use-after-free in macb_remove+0x77/0xc6 [macb_pci]
> [ 31.275563] Freed by task 306:
> [ 30.276782] platform_device_release+0x25/0x80
>
> Signed-off-by: Tong Zhang <ztong0001@gmail.com>
> ---
> drivers/net/ethernet/cadence/macb_pci.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/cadence/macb_pci.c b/drivers/net/ethernet/cadence/macb_pci.c
> index 8b7b59908a1a..4dd0cec2e542 100644
> --- a/drivers/net/ethernet/cadence/macb_pci.c
> +++ b/drivers/net/ethernet/cadence/macb_pci.c
> @@ -110,10 +110,12 @@ static void macb_remove(struct pci_dev *pdev)
> {
> struct platform_device *plat_dev = pci_get_drvdata(pdev);
> struct macb_platform_data *plat_data = dev_get_platdata(&plat_dev->dev);
> + struct clk *pclk = plat_data->pclk;
> + struct clk *hclk = plat_data->hclk;
>
> platform_device_unregister(plat_dev);
> - clk_unregister(plat_data->pclk);
> - clk_unregister(plat_data->hclk);
> + clk_unregister(pclk);
> + clk_unregister(hclk);
NACK, I would prefer that you switch lines and do clock clk unregister
before: this way we avoid the problem and I think that you don't need
clocks for unregistering the platform device anyway.
Please change accordingly or tell me what could go bad.
Regards,
Nicolas
> }
>
> static const struct pci_device_id dev_id_table[] = {
> --
> 2.25.1
>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v2] net: macb: fix use after free on rmmod
2021-09-08 7:27 ` Nicolas.Ferre
@ 2021-09-08 19:02 ` Tong Zhang
2021-09-09 7:53 ` Nicolas Ferre
2021-09-09 10:00 ` patchwork-bot+netdevbpf
2021-09-08 19:02 ` [PATCH v1] " Tong Zhang
1 sibling, 2 replies; 6+ messages in thread
From: Tong Zhang @ 2021-09-08 19:02 UTC (permalink / raw)
To: Nicolas Ferre, Claudiu Beznea, David S. Miller, Jakub Kicinski,
netdev, linux-kernel
Cc: Tong Zhang, Nicolas Ferre
plat_dev->dev->platform_data is released by platform_device_unregister(),
use of pclk and hclk is a use-after-free. Since device unregister won't
need a clk device we adjust the function call sequence to fix this issue.
[ 31.261225] BUG: KASAN: use-after-free in macb_remove+0x77/0xc6 [macb_pci]
[ 31.275563] Freed by task 306:
[ 30.276782] platform_device_release+0x25/0x80
Suggested-by: Nicolas Ferre <Nicolas.Ferre@microchip.com>
Signed-off-by: Tong Zhang <ztong0001@gmail.com>
---
v2: switch lines to fix the issue instead
drivers/net/ethernet/cadence/macb_pci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/cadence/macb_pci.c b/drivers/net/ethernet/cadence/macb_pci.c
index 8b7b59908a1a..f66d22de5168 100644
--- a/drivers/net/ethernet/cadence/macb_pci.c
+++ b/drivers/net/ethernet/cadence/macb_pci.c
@@ -111,9 +111,9 @@ static void macb_remove(struct pci_dev *pdev)
struct platform_device *plat_dev = pci_get_drvdata(pdev);
struct macb_platform_data *plat_data = dev_get_platdata(&plat_dev->dev);
- platform_device_unregister(plat_dev);
clk_unregister(plat_data->pclk);
clk_unregister(plat_data->hclk);
+ platform_device_unregister(plat_dev);
}
static const struct pci_device_id dev_id_table[] = {
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v2] net: macb: fix use after free on rmmod
2021-09-08 19:02 ` [PATCH v2] " Tong Zhang
@ 2021-09-09 7:53 ` Nicolas Ferre
2021-09-09 10:00 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 6+ messages in thread
From: Nicolas Ferre @ 2021-09-09 7:53 UTC (permalink / raw)
To: Tong Zhang, Claudiu Beznea, David S. Miller, Jakub Kicinski,
netdev, linux-kernel
On 08/09/2021 at 21:02, Tong Zhang wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
> plat_dev->dev->platform_data is released by platform_device_unregister(),
> use of pclk and hclk is a use-after-free. Since device unregister won't
> need a clk device we adjust the function call sequence to fix this issue.
>
> [ 31.261225] BUG: KASAN: use-after-free in macb_remove+0x77/0xc6 [macb_pci]
> [ 31.275563] Freed by task 306:
> [ 30.276782] platform_device_release+0x25/0x80
>
> Suggested-by: Nicolas Ferre <Nicolas.Ferre@microchip.com>
> Signed-off-by: Tong Zhang <ztong0001@gmail.com>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Thanks Tong Zhang.
Regards,
Nicolas
> ---
> v2: switch lines to fix the issue instead
>
> drivers/net/ethernet/cadence/macb_pci.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/cadence/macb_pci.c b/drivers/net/ethernet/cadence/macb_pci.c
> index 8b7b59908a1a..f66d22de5168 100644
> --- a/drivers/net/ethernet/cadence/macb_pci.c
> +++ b/drivers/net/ethernet/cadence/macb_pci.c
> @@ -111,9 +111,9 @@ static void macb_remove(struct pci_dev *pdev)
> struct platform_device *plat_dev = pci_get_drvdata(pdev);
> struct macb_platform_data *plat_data = dev_get_platdata(&plat_dev->dev);
>
> - platform_device_unregister(plat_dev);
> clk_unregister(plat_data->pclk);
> clk_unregister(plat_data->hclk);
> + platform_device_unregister(plat_dev);
> }
>
> static const struct pci_device_id dev_id_table[] = {
> --
> 2.25.1
>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2] net: macb: fix use after free on rmmod
2021-09-08 19:02 ` [PATCH v2] " Tong Zhang
2021-09-09 7:53 ` Nicolas Ferre
@ 2021-09-09 10:00 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 6+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-09-09 10:00 UTC (permalink / raw)
To: Tong Zhang
Cc: nicolas.ferre, claudiu.beznea, davem, kuba, netdev, linux-kernel,
Nicolas.Ferre
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
On Wed, 8 Sep 2021 12:02:32 -0700 you wrote:
> plat_dev->dev->platform_data is released by platform_device_unregister(),
> use of pclk and hclk is a use-after-free. Since device unregister won't
> need a clk device we adjust the function call sequence to fix this issue.
>
> [ 31.261225] BUG: KASAN: use-after-free in macb_remove+0x77/0xc6 [macb_pci]
> [ 31.275563] Freed by task 306:
> [ 30.276782] platform_device_release+0x25/0x80
>
> [...]
Here is the summary with links:
- [v2] net: macb: fix use after free on rmmod
https://git.kernel.org/netdev/net/c/d82d5303c4c5
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v1] net: macb: fix use after free on rmmod
2021-09-08 7:27 ` Nicolas.Ferre
2021-09-08 19:02 ` [PATCH v2] " Tong Zhang
@ 2021-09-08 19:02 ` Tong Zhang
1 sibling, 0 replies; 6+ messages in thread
From: Tong Zhang @ 2021-09-08 19:02 UTC (permalink / raw)
To: Nicolas Ferre
Cc: Claudiu Beznea, David S. Miller, Jakub Kicinski, Netdev, open list
Thanks Nicolas, sent a v2 as suggested.
- Tong
On Wed, Sep 8, 2021 at 12:27 AM <Nicolas.Ferre@microchip.com> wrote:
>
> On 07/09/2021 at 22:29, Tong Zhang wrote:
> > plat_dev->dev->platform_data is released by platform_device_unregister(),
> > use of pclk and hclk is use after free. This patch keeps a copy to fix
> > the issue.
> >
> > [ 31.261225] BUG: KASAN: use-after-free in macb_remove+0x77/0xc6 [macb_pci]
> > [ 31.275563] Freed by task 306:
> > [ 30.276782] platform_device_release+0x25/0x80
> >
> > Signed-off-by: Tong Zhang <ztong0001@gmail.com>
> > ---
> > drivers/net/ethernet/cadence/macb_pci.c | 6 ++++--
> > 1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/net/ethernet/cadence/macb_pci.c b/drivers/net/ethernet/cadence/macb_pci.c
> > index 8b7b59908a1a..4dd0cec2e542 100644
> > --- a/drivers/net/ethernet/cadence/macb_pci.c
> > +++ b/drivers/net/ethernet/cadence/macb_pci.c
> > @@ -110,10 +110,12 @@ static void macb_remove(struct pci_dev *pdev)
> > {
> > struct platform_device *plat_dev = pci_get_drvdata(pdev);
> > struct macb_platform_data *plat_data = dev_get_platdata(&plat_dev->dev);
> > + struct clk *pclk = plat_data->pclk;
> > + struct clk *hclk = plat_data->hclk;
> >
> > platform_device_unregister(plat_dev);
> > - clk_unregister(plat_data->pclk);
> > - clk_unregister(plat_data->hclk);
> > + clk_unregister(pclk);
> > + clk_unregister(hclk);
>
> NACK, I would prefer that you switch lines and do clock clk unregister
> before: this way we avoid the problem and I think that you don't need
> clocks for unregistering the platform device anyway.
>
> Please change accordingly or tell me what could go bad.
>
> Regards,
> Nicolas
>
>
> > }
> >
> > static const struct pci_device_id dev_id_table[] = {
> > --
> > 2.25.1
> >
>
>
> --
> Nicolas Ferre
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-09-09 10:00 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-07 20:29 [PATCH v1] net: macb: fix use after free on rmmod Tong Zhang
2021-09-08 7:27 ` Nicolas.Ferre
2021-09-08 19:02 ` [PATCH v2] " Tong Zhang
2021-09-09 7:53 ` Nicolas Ferre
2021-09-09 10:00 ` patchwork-bot+netdevbpf
2021-09-08 19:02 ` [PATCH v1] " Tong Zhang
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).