Skip to content

Commit

Permalink
drivers: net: mhi: fix error path in mhi_net_newlink
Browse files Browse the repository at this point in the history
commit 4526fe7 upstream.

Fix double free_netdev when mhi_prepare_for_transfer fails.

Fixes: 3ffec6a ("net: Add mhi-net driver")
Signed-off-by: Daniele Palmas <dnlplm@gmail.com>
Reviewed-by: Manivannan Sadhasivam <mani@kernel.org>
Reviewed-by: Loic Poulain <loic.poulain@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
dnlplm authored and gregkh committed Oct 7, 2021
1 parent 14492ff commit a7d4cb2
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/net/mhi/net.c
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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;
}

Expand Down

0 comments on commit a7d4cb2

Please sign in to comment.