From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 4 Oct 2021 12:19:01 +0000 (+0200)
Subject: 5.14-stable patches
X-Git-Tag: v4.4.286~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c833dd3a37a1c44225aa873e1da19827cae02ade;p=thirdparty%2Fkernel%2Fstable-queue.git

5.14-stable patches

added patches:
	drivers-net-mhi-fix-error-path-in-mhi_net_newlink.patch
---

diff --git a/queue-5.14/drivers-net-mhi-fix-error-path-in-mhi_net_newlink.patch b/queue-5.14/drivers-net-mhi-fix-error-path-in-mhi_net_newlink.patch
new file mode 100644
index 00000000000..0053e0b4e5b
--- /dev/null
+++ b/queue-5.14/drivers-net-mhi-fix-error-path-in-mhi_net_newlink.patch
@@ -0,0 +1,50 @@
+From 4526fe74c3c5095cc55931a3a6fb4932f9e06002 Mon Sep 17 00:00:00 2001
+From: Daniele Palmas <dnlplm@gmail.com>
+Date: Fri, 24 Sep 2021 11:26:52 +0200
+Subject: drivers: net: mhi: fix error path in mhi_net_newlink
+
+From: Daniele Palmas <dnlplm@gmail.com>
+
+commit 4526fe74c3c5095cc55931a3a6fb4932f9e06002 upstream.
+
+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: 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>
+---
+ drivers/net/mhi/net.c |    6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+--- a/drivers/net/mhi/net.c
++++ b/drivers/net/mhi/net.c
+@@ -337,7 +337,7 @@ static int mhi_net_newlink(void *ctxt, s
+ 	/* 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, s
+ 	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, s
+ 
+ out_err_proto:
+ 	unregister_netdevice(ndev);
+-out_err:
+-	free_netdev(ndev);
+ 	return err;
+ }
+ 
diff --git a/queue-5.14/series b/queue-5.14/series
index ddd2d3beeb3..89c03fa3f71 100644
--- a/queue-5.14/series
+++ b/queue-5.14/series
@@ -169,3 +169,4 @@ net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch
 kvm-x86-handle-srcu-initialization-failure-during-page-track-init.patch
 netfilter-conntrack-serialize-hash-resizes-and-cleanups.patch
 netfilter-nf_tables-fix-oversized-kvmalloc-calls.patch
+drivers-net-mhi-fix-error-path-in-mhi_net_newlink.patch