Commit d7f513ae authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-net-2024-10-16' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth 

Pull bluetooth fixes from Luiz Augusto Von Dentz:

 - ISO: Fix multiple init when debugfs is disabled

 - Call iso_exit() on module unload

 - Remove debugfs directory on module init failure

 - btusb: Fix not being able to reconnect after suspend

 - btusb: Fix regression with fake CSR controllers 0a12:0001

 - bnep: fix wild-memory-access in proto_unregister

Note: normally the bluetooth fixes go through the networking tree, but
this missed the weekly merge, and two of the commits fix regressions
that have caused a fair amount of noise and have now hit stable too:

  https://lore.kernel.org/all/4e1977ca-6166-4891-965e-34a6f319035f@leemhuis.info/

So I'm pulling it directly just to expedite things and not miss yet
another -rc release. This is not meant to become a new pattern.

* tag 'for-net-2024-10-16' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth:
  Bluetooth: btusb: Fix regression with fake CSR controllers 0a12:0001
  Bluetooth: bnep: fix wild-memory-access in proto_unregister
  Bluetooth: btusb: Fix not being able to reconnect after suspend
  Bluetooth: Remove debugfs directory on module init failure
  Bluetooth: Call iso_exit() on module unload
  Bluetooth: ISO: Fix multiple init when debugfs is disabled
parents dd4f5037 2c1dda2a

drivers/bluetooth/btusb.c

+9 −18
Original line number Diff line number Diff line
@@ -1345,6 +1345,11 @@ static int btusb_submit_intr_urb(struct hci_dev *hdev, gfp_t mem_flags) 
	if (!urb)

		return -ENOMEM;



	if (le16_to_cpu(data->udev->descriptor.idVendor)  == 0x0a12 &&

	    le16_to_cpu(data->udev->descriptor.idProduct) == 0x0001)

		/* Fake CSR devices don't seem to support sort-transter */

		size = le16_to_cpu(data->intr_ep->wMaxPacketSize);

	else

		/* Use maximum HCI Event size so the USB stack handles

		 * ZPL/short-transfer automatically.

		 */
@@ -4038,7 +4043,6 @@ static void btusb_disconnect(struct usb_interface *intf) 
static int btusb_suspend(struct usb_interface *intf, pm_message_t message)

{

	struct btusb_data *data = usb_get_intfdata(intf);

	int err;



	BT_DBG("intf %p", intf);
@@ -4051,16 +4055,6 @@ static int btusb_suspend(struct usb_interface *intf, pm_message_t message) 
	if (data->suspend_count++)

		return 0;



	/* Notify Host stack to suspend; this has to be done before stopping

	 * the traffic since the hci_suspend_dev itself may generate some

	 * traffic.

	 */

	err = hci_suspend_dev(data->hdev);

	if (err) {

		data->suspend_count--;

		return err;

	}



	spin_lock_irq(&data->txlock);

	if (!(PMSG_IS_AUTO(message) && data->tx_in_flight)) {

		set_bit(BTUSB_SUSPENDING, &data->flags);
@@ -4068,7 +4062,6 @@ static int btusb_suspend(struct usb_interface *intf, pm_message_t message) 
	} else {

		spin_unlock_irq(&data->txlock);

		data->suspend_count--;

		hci_resume_dev(data->hdev);

		return -EBUSY;

	}
@@ -4189,8 +4182,6 @@ static int btusb_resume(struct usb_interface *intf) 
	spin_unlock_irq(&data->txlock);

	schedule_work(&data->work);



	hci_resume_dev(data->hdev);



	return 0;



failed:

net/bluetooth/af_bluetooth.c

+3 −0
Original line number Diff line number Diff line
@@ -825,11 +825,14 @@ static int __init bt_init(void) 
	bt_sysfs_cleanup();

cleanup_led:

	bt_leds_cleanup();

	debugfs_remove_recursive(bt_debugfs);

	return err;

}



static void __exit bt_exit(void)

{

	iso_exit();



	mgmt_exit();



	sco_exit();

net/bluetooth/bnep/core.c

+1 −2
Original line number Diff line number Diff line
@@ -745,8 +745,7 @@ static int __init bnep_init(void) 
	if (flt[0])

		BT_INFO("BNEP filters: %s", flt);



	bnep_sock_init();

	return 0;

	return bnep_sock_init();

}



static void __exit bnep_exit(void)

net/bluetooth/iso.c

+1 −5
Original line number Diff line number Diff line
@@ -2301,13 +2301,9 @@ int iso_init(void) 


	hci_register_cb(&iso_cb);



	if (IS_ERR_OR_NULL(bt_debugfs))

		return 0;



	if (!iso_debugfs) {

	if (!IS_ERR_OR_NULL(bt_debugfs))

		iso_debugfs = debugfs_create_file("iso", 0444, bt_debugfs,

						  NULL, &iso_debugfs_fops);

	}



	iso_inited = true;