* [PATCH 1/1] drivers: net: mhi: fix error path in mhi_net_newlink
@ 2021-10-04 11:46 Daniele Palmas
2021-10-04 12:19 ` Greg Kroah-Hartman
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Daniele Palmas @ 2021-10-04 11:46 UTC (permalink / raw)
To: Loic Poulain, Manivannan Sadhasivam, David S . Miller,
Jakub Kicinski, Sergey Ryazanov, Greg Kroah-Hartman
Cc: netdev, stable, Daniele Palmas
Fix double free_netdev when mhi_prepare_for_transfer fails.
This is a back-port of upstream:
commit 4526fe74c3c509 ("drivers: net: mhi: fix error path in mhi_net_newlink")
Fixes: 13adac032982 ("net: mhi_net: Register wwan_ops for link creation")
Signed-off-by: Daniele Palmas <dnlplm@gmail.com>
---
Hello Greg,
if maintainers ack, this should go just to 5.14 branch.
Thanks,
Daniele
---
drivers/net/mhi/net.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/net/mhi/net.c b/drivers/net/mhi/net.c
index e60e38c1f09d..5e49f7a919b6 100644
--- a/drivers/net/mhi/net.c
+++ b/drivers/net/mhi/net.c
@@ -337,7 +337,7 @@ static int mhi_net_newlink(void *ctxt, struct net_device *ndev, u32 if_id,
/* Start MHI channels */
err = mhi_prepare_for_transfer(mhi_dev);
if (err)
- goto out_err;
+ return err;
/* Number of transfer descriptors determines size of the queue */
mhi_netdev->rx_queue_sz = mhi_get_free_desc_count(mhi_dev, DMA_FROM_DEVICE);
@@ -347,7 +347,7 @@ static int mhi_net_newlink(void *ctxt, struct net_device *ndev, u32 if_id,
else
err = register_netdev(ndev);
if (err)
- goto out_err;
+ return err;
if (mhi_netdev->proto) {
err = mhi_netdev->proto->init(mhi_netdev);
@@ -359,8 +359,6 @@ static int mhi_net_newlink(void *ctxt, struct net_device *ndev, u32 if_id,
out_err_proto:
unregister_netdevice(ndev);
-out_err:
- free_netdev(ndev);
return err;
}
--
2.30.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 1/1] drivers: net: mhi: fix error path in mhi_net_newlink
2021-10-04 11:46 [PATCH 1/1] drivers: net: mhi: fix error path in mhi_net_newlink Daniele Palmas
@ 2021-10-04 12:19 ` Greg Kroah-Hartman
2021-10-04 12:26 ` Manivannan Sadhasivam
2021-10-06 9:08 ` Sergey Ryazanov
2 siblings, 0 replies; 9+ messages in thread
From: Greg Kroah-Hartman @ 2021-10-04 12:19 UTC (permalink / raw)
To: Daniele Palmas
Cc: Loic Poulain, Manivannan Sadhasivam, David S . Miller,
Jakub Kicinski, Sergey Ryazanov, netdev, stable
On Mon, Oct 04, 2021 at 01:46:01PM +0200, Daniele Palmas wrote:
> Fix double free_netdev when mhi_prepare_for_transfer fails.
>
> This is a back-port of upstream:
> commit 4526fe74c3c509 ("drivers: net: mhi: fix error path in mhi_net_newlink")
>
> Fixes: 13adac032982 ("net: mhi_net: Register wwan_ops for link creation")
> Signed-off-by: Daniele Palmas <dnlplm@gmail.com>
> ---
> Hello Greg,
>
> if maintainers ack, this should go just to 5.14 branch.
Looks good to me, thanks!
greg k-h
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 1/1] drivers: net: mhi: fix error path in mhi_net_newlink
2021-10-04 11:46 [PATCH 1/1] drivers: net: mhi: fix error path in mhi_net_newlink Daniele Palmas
2021-10-04 12:19 ` Greg Kroah-Hartman
@ 2021-10-04 12:26 ` Manivannan Sadhasivam
2021-10-06 9:08 ` Sergey Ryazanov
2 siblings, 0 replies; 9+ messages in thread
From: Manivannan Sadhasivam @ 2021-10-04 12:26 UTC (permalink / raw)
To: Daniele Palmas
Cc: Loic Poulain, David S . Miller, Jakub Kicinski, Sergey Ryazanov,
Greg Kroah-Hartman, netdev, stable
On Mon, Oct 04, 2021 at 01:46:01PM +0200, Daniele Palmas wrote:
> Fix double free_netdev when mhi_prepare_for_transfer fails.
>
> This is a back-port of upstream:
> commit 4526fe74c3c509 ("drivers: net: mhi: fix error path in mhi_net_newlink")
>
> Fixes: 13adac032982 ("net: mhi_net: Register wwan_ops for link creation")
> Signed-off-by: Daniele Palmas <dnlplm@gmail.com>
Reviewed-by: Manivannan Sadhasivam <mani@kernel.org>
Thanks,
Mani
> ---
> Hello Greg,
>
> if maintainers ack, this should go just to 5.14 branch.
>
> Thanks,
> Daniele
> ---
> drivers/net/mhi/net.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/mhi/net.c b/drivers/net/mhi/net.c
> index e60e38c1f09d..5e49f7a919b6 100644
> --- a/drivers/net/mhi/net.c
> +++ b/drivers/net/mhi/net.c
> @@ -337,7 +337,7 @@ static int mhi_net_newlink(void *ctxt, struct net_device *ndev, u32 if_id,
> /* Start MHI channels */
> err = mhi_prepare_for_transfer(mhi_dev);
> if (err)
> - goto out_err;
> + return err;
>
> /* Number of transfer descriptors determines size of the queue */
> mhi_netdev->rx_queue_sz = mhi_get_free_desc_count(mhi_dev, DMA_FROM_DEVICE);
> @@ -347,7 +347,7 @@ static int mhi_net_newlink(void *ctxt, struct net_device *ndev, u32 if_id,
> else
> err = register_netdev(ndev);
> if (err)
> - goto out_err;
> + return err;
>
> if (mhi_netdev->proto) {
> err = mhi_netdev->proto->init(mhi_netdev);
> @@ -359,8 +359,6 @@ static int mhi_net_newlink(void *ctxt, struct net_device *ndev, u32 if_id,
>
> out_err_proto:
> unregister_netdevice(ndev);
> -out_err:
> - free_netdev(ndev);
> return err;
> }
>
> --
> 2.30.2
>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 1/1] drivers: net: mhi: fix error path in mhi_net_newlink
2021-10-04 11:46 [PATCH 1/1] drivers: net: mhi: fix error path in mhi_net_newlink Daniele Palmas
2021-10-04 12:19 ` Greg Kroah-Hartman
2021-10-04 12:26 ` Manivannan Sadhasivam
@ 2021-10-06 9:08 ` Sergey Ryazanov
2 siblings, 0 replies; 9+ messages in thread
From: Sergey Ryazanov @ 2021-10-06 9:08 UTC (permalink / raw)
To: Daniele Palmas
Cc: Loic Poulain, Manivannan Sadhasivam, David S . Miller,
Jakub Kicinski, Greg Kroah-Hartman, netdev, stable
On Mon, Oct 4, 2021 at 2:45 PM Daniele Palmas <dnlplm@gmail.com> wrote:
>
> Fix double free_netdev when mhi_prepare_for_transfer fails.
>
> This is a back-port of upstream:
> commit 4526fe74c3c509 ("drivers: net: mhi: fix error path in mhi_net_newlink")
>
> Fixes: 13adac032982 ("net: mhi_net: Register wwan_ops for link creation")
> Signed-off-by: Daniele Palmas <dnlplm@gmail.com>
Looks good for me too, thank you for taking care of this!
Acked-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/1] drivers: net: mhi: fix error path in mhi_net_newlink
@ 2021-09-24 9:26 Daniele Palmas
2021-09-24 9:49 ` Manivannan Sadhasivam
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Daniele Palmas @ 2021-09-24 9:26 UTC (permalink / raw)
To: Loic Poulain, Manivannan Sadhasivam, David S . Miller,
Jakub Kicinski
Cc: netdev, Daniele Palmas
Fix double free_netdev when mhi_prepare_for_transfer fails.
Fixes: 3ffec6a14f24 ("net: Add mhi-net driver")
Signed-off-by: Daniele Palmas <dnlplm@gmail.com>
---
drivers/net/mhi_net.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/net/mhi_net.c b/drivers/net/mhi_net.c
index d127eb6e9257..aaa628f859fd 100644
--- a/drivers/net/mhi_net.c
+++ b/drivers/net/mhi_net.c
@@ -321,7 +321,7 @@ static int mhi_net_newlink(struct mhi_device *mhi_dev, struct net_device *ndev)
/* Start MHI channels */
err = mhi_prepare_for_transfer(mhi_dev);
if (err)
- goto out_err;
+ return err;
/* Number of transfer descriptors determines size of the queue */
mhi_netdev->rx_queue_sz = mhi_get_free_desc_count(mhi_dev, DMA_FROM_DEVICE);
@@ -331,10 +331,6 @@ static int mhi_net_newlink(struct mhi_device *mhi_dev, struct net_device *ndev)
return err;
return 0;
-
-out_err:
- free_netdev(ndev);
- return err;
}
static void mhi_net_dellink(struct mhi_device *mhi_dev, struct net_device *ndev)
--
2.30.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 1/1] drivers: net: mhi: fix error path in mhi_net_newlink
2021-09-24 9:26 Daniele Palmas
@ 2021-09-24 9:49 ` Manivannan Sadhasivam
2021-09-24 11:11 ` Daniele Palmas
2021-09-24 9:50 ` Loic Poulain
2021-09-24 13:30 ` patchwork-bot+netdevbpf
2 siblings, 1 reply; 9+ messages in thread
From: Manivannan Sadhasivam @ 2021-09-24 9:49 UTC (permalink / raw)
To: Daniele Palmas; +Cc: Loic Poulain, David S . Miller, Jakub Kicinski, netdev
On Fri, Sep 24, 2021 at 11:26:52AM +0200, Daniele Palmas wrote:
> Fix double free_netdev when mhi_prepare_for_transfer fails.
>
> Fixes: 3ffec6a14f24 ("net: Add mhi-net driver")
> Signed-off-by: Daniele Palmas <dnlplm@gmail.com>
I guess this patch should be backported to stable kernels. So please CC stable
list.
Reviewed-by: Manivannan Sadhasivam <mani@kernel.org>
Thanks,
Mani
> ---
> drivers/net/mhi_net.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/drivers/net/mhi_net.c b/drivers/net/mhi_net.c
> index d127eb6e9257..aaa628f859fd 100644
> --- a/drivers/net/mhi_net.c
> +++ b/drivers/net/mhi_net.c
> @@ -321,7 +321,7 @@ static int mhi_net_newlink(struct mhi_device *mhi_dev, struct net_device *ndev)
> /* Start MHI channels */
> err = mhi_prepare_for_transfer(mhi_dev);
> if (err)
> - goto out_err;
> + return err;
>
> /* Number of transfer descriptors determines size of the queue */
> mhi_netdev->rx_queue_sz = mhi_get_free_desc_count(mhi_dev, DMA_FROM_DEVICE);
> @@ -331,10 +331,6 @@ static int mhi_net_newlink(struct mhi_device *mhi_dev, struct net_device *ndev)
> return err;
>
> return 0;
> -
> -out_err:
> - free_netdev(ndev);
> - return err;
> }
>
> static void mhi_net_dellink(struct mhi_device *mhi_dev, struct net_device *ndev)
> --
> 2.30.2
>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 1/1] drivers: net: mhi: fix error path in mhi_net_newlink
2021-09-24 9:49 ` Manivannan Sadhasivam
@ 2021-09-24 11:11 ` Daniele Palmas
0 siblings, 0 replies; 9+ messages in thread
From: Daniele Palmas @ 2021-09-24 11:11 UTC (permalink / raw)
To: Manivannan Sadhasivam
Cc: Loic Poulain, David S . Miller, Jakub Kicinski,
Network Development
Hi Mani,
Il giorno ven 24 set 2021 alle ore 11:49 Manivannan Sadhasivam
<mani@kernel.org> ha scritto:
>
> On Fri, Sep 24, 2021 at 11:26:52AM +0200, Daniele Palmas wrote:
> > Fix double free_netdev when mhi_prepare_for_transfer fails.
> >
> > Fixes: 3ffec6a14f24 ("net: Add mhi-net driver")
> > Signed-off-by: Daniele Palmas <dnlplm@gmail.com>
>
> I guess this patch should be backported to stable kernels. So please CC stable
> list.
Just v5.14.x seems to be affected by the same issue, but it requires a
slightly different patch: I'll try to take care of that.
Thanks,
Daniele
>
> Reviewed-by: Manivannan Sadhasivam <mani@kernel.org>
>
> Thanks,
> Mani
>
> > ---
> > drivers/net/mhi_net.c | 6 +-----
> > 1 file changed, 1 insertion(+), 5 deletions(-)
> >
> > diff --git a/drivers/net/mhi_net.c b/drivers/net/mhi_net.c
> > index d127eb6e9257..aaa628f859fd 100644
> > --- a/drivers/net/mhi_net.c
> > +++ b/drivers/net/mhi_net.c
> > @@ -321,7 +321,7 @@ static int mhi_net_newlink(struct mhi_device *mhi_dev, struct net_device *ndev)
> > /* Start MHI channels */
> > err = mhi_prepare_for_transfer(mhi_dev);
> > if (err)
> > - goto out_err;
> > + return err;
> >
> > /* Number of transfer descriptors determines size of the queue */
> > mhi_netdev->rx_queue_sz = mhi_get_free_desc_count(mhi_dev, DMA_FROM_DEVICE);
> > @@ -331,10 +331,6 @@ static int mhi_net_newlink(struct mhi_device *mhi_dev, struct net_device *ndev)
> > return err;
> >
> > return 0;
> > -
> > -out_err:
> > - free_netdev(ndev);
> > - return err;
> > }
> >
> > static void mhi_net_dellink(struct mhi_device *mhi_dev, struct net_device *ndev)
> > --
> > 2.30.2
> >
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/1] drivers: net: mhi: fix error path in mhi_net_newlink
2021-09-24 9:26 Daniele Palmas
2021-09-24 9:49 ` Manivannan Sadhasivam
@ 2021-09-24 9:50 ` Loic Poulain
2021-09-24 13:30 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 9+ messages in thread
From: Loic Poulain @ 2021-09-24 9:50 UTC (permalink / raw)
To: Daniele Palmas
Cc: Manivannan Sadhasivam, David S . Miller, Jakub Kicinski,
Network Development
On Fri, 24 Sept 2021 at 11:27, Daniele Palmas <dnlplm@gmail.com> wrote:
>
> Fix double free_netdev when mhi_prepare_for_transfer fails.
>
> Fixes: 3ffec6a14f24 ("net: Add mhi-net driver")
> Signed-off-by: Daniele Palmas <dnlplm@gmail.com>
Reviewed-by: Loic Poulain <loic.poulain@linaro.org>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 1/1] drivers: net: mhi: fix error path in mhi_net_newlink
2021-09-24 9:26 Daniele Palmas
2021-09-24 9:49 ` Manivannan Sadhasivam
2021-09-24 9:50 ` Loic Poulain
@ 2021-09-24 13:30 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 9+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-09-24 13:30 UTC (permalink / raw)
To: Daniele Palmas; +Cc: loic.poulain, mani, davem, kuba, netdev
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
On Fri, 24 Sep 2021 11:26:52 +0200 you wrote:
> Fix double free_netdev when mhi_prepare_for_transfer fails.
>
> Fixes: 3ffec6a14f24 ("net: Add mhi-net driver")
> Signed-off-by: Daniele Palmas <dnlplm@gmail.com>
> ---
> drivers/net/mhi_net.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
Here is the summary with links:
- [1/1] drivers: net: mhi: fix error path in mhi_net_newlink
https://git.kernel.org/netdev/net/c/4526fe74c3c5
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] 9+ messages in thread
end of thread, other threads:[~2021-10-06 9:08 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-04 11:46 [PATCH 1/1] drivers: net: mhi: fix error path in mhi_net_newlink Daniele Palmas
2021-10-04 12:19 ` Greg Kroah-Hartman
2021-10-04 12:26 ` Manivannan Sadhasivam
2021-10-06 9:08 ` Sergey Ryazanov
-- strict thread matches above, loose matches on Subject: below --
2021-09-24 9:26 Daniele Palmas
2021-09-24 9:49 ` Manivannan Sadhasivam
2021-09-24 11:11 ` Daniele Palmas
2021-09-24 9:50 ` Loic Poulain
2021-09-24 13:30 ` patchwork-bot+netdevbpf
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).