hso: fix bailout in error case of probe

The driver tries to reuse code for disconnect in case of a failed probe. If resources need to be freed after an error in probe, the netdev must not be freed because it has never been registered. Fix it by telling the helper which path we are in. Signed-off-by: Oliver Neukum <[email protected]> Signed-off-by: David S. Miller <[email protected]>
torvalds · Aug 6, 2020 · 5fcfb6d · 5fcfb6d
1 parent 8ed54f1
commit 5fcfb6d
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
@@ -2357,7 +2357,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)
+static void hso_free_net_device(struct hso_device *hso_dev, bool bailout)
 {
  int i;
  struct hso_net *hso_net = dev2net(hso_dev);
@@ -2380,7 +2380,7 @@ static void hso_free_net_device(struct hso_device *hso_dev)
  kfree(hso_net->mux_bulk_tx_buf);
  hso_net->mux_bulk_tx_buf = NULL;
 
- if (hso_net->net)
+ if (hso_net->net && !bailout)
  free_netdev(hso_net->net);
 
  kfree(hso_dev);
@@ -2556,7 +2556,7 @@ static struct hso_device *hso_create_net_device(struct usb_interface *interface,
 
  return hso_dev;
 exit:
- hso_free_net_device(hso_dev);
+ hso_free_net_device(hso_dev, true);
  return NULL;
 }
 
@@ -3133,7 +3133,7 @@ static void hso_free_interface(struct usb_interface *interface)
  rfkill_unregister(rfk);
  rfkill_destroy(rfk);
  }
- hso_free_net_device(network_table[i]);
+ hso_free_net_device(network_table[i], false);
  }
  }
 }