stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ovidiu Panait <ovidiu.panait@windriver.com>
To: stable@vger.kernel.org
Cc: greg@kroah.com
Subject: [PATCH 5.4 3/3] usb: hso: remove the bailout parameter
Date: Tue, 28 Sep 2021 16:15:23 +0300	[thread overview]
Message-ID: <20210928131523.2314252-4-ovidiu.panait@windriver.com> (raw)
In-Reply-To: <20210928131523.2314252-1-ovidiu.panait@windriver.com>

From: Dongliang Mu <mudongliangabcd@gmail.com>

commit dcb713d53e2eadf42b878c12a471e74dc6ed3145 upstream.

There are two invocation sites of hso_free_net_device. After
refactoring hso_create_net_device, this parameter is useless.
Remove the bailout in the hso_free_net_device and change the invocation
sites of this function.

Signed-off-by: Dongliang Mu <mudongliangabcd@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
---
 drivers/net/usb/hso.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 762f7a4db809..95da2576a221 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -2354,7 +2354,7 @@ static int remove_net_device(struct hso_device *hso_dev)
 }
 
 /* Frees our network device */
-static void hso_free_net_device(struct hso_device *hso_dev, bool bailout)
+static void hso_free_net_device(struct hso_device *hso_dev)
 {
 	int i;
 	struct hso_net *hso_net = dev2net(hso_dev);
@@ -2377,7 +2377,7 @@ static void hso_free_net_device(struct hso_device *hso_dev, bool bailout)
 	kfree(hso_net->mux_bulk_tx_buf);
 	hso_net->mux_bulk_tx_buf = NULL;
 
-	if (hso_net->net && !bailout)
+	if (hso_net->net)
 		free_netdev(hso_net->net);
 
 	kfree(hso_dev);
@@ -3135,7 +3135,7 @@ static void hso_free_interface(struct usb_interface *interface)
 				rfkill_unregister(rfk);
 				rfkill_destroy(rfk);
 			}
-			hso_free_net_device(network_table[i], false);
+			hso_free_net_device(network_table[i]);
 		}
 	}
 }
-- 
2.25.1


  parent reply	other threads:[~2021-09-28 13:16 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-28 13:15 [PATCH 5.4 0/3] usb: hso: backport CVE-2021-37159 fix Ovidiu Panait
2021-09-28 13:15 ` [PATCH 5.4 1/3] hso: fix bailout in error case of probe Ovidiu Panait
2021-09-28 13:15 ` [PATCH 5.4 2/3] usb: hso: fix error handling code of hso_create_net_device Ovidiu Panait
2021-09-28 13:15 ` Ovidiu Panait [this message]
2021-09-28 19:29 ` [PATCH 5.4 0/3] usb: hso: backport CVE-2021-37159 fix Salvatore Bonaccorso
2021-09-29  8:03   ` Ovidiu Panait
2021-10-01 16:55     ` Sasha Levin
2021-10-02 12:36       ` Ovidiu Panait
2021-10-02 18:51         ` Salvatore Bonaccorso
2021-10-04 11:15 ` Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210928131523.2314252-4-ovidiu.panait@windriver.com \
    --to=ovidiu.panait@windriver.com \
    --cc=greg@kroah.com \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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).