Commit 0fd7b2a4 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'for-net-2025-02-27' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth 

Luiz Augusto von Dentz says:

====================
bluetooth pull request for net:

 - mgmt: Check return of mgmt_alloc_skb
 - btusb: Initialize .owner field of force_poll_sync_fops

* tag 'for-net-2025-02-27' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth:
  Bluetooth: Add check for mgmt_alloc_skb() in mgmt_device_connected()
  Bluetooth: Add check for mgmt_alloc_skb() in mgmt_remote_name()
  bluetooth: btusb: Initialize .owner field of force_poll_sync_fops
====================

Link: https://patch.msgid.link/20250227223802.3299088-1-luiz.dentz@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 00371a3f d8df010f

drivers/bluetooth/btusb.c

+1 −0
Original line number Diff line number Diff line
@@ -3644,6 +3644,7 @@ static ssize_t force_poll_sync_write(struct file *file, 
}



static const struct file_operations force_poll_sync_fops = {

	.owner		= THIS_MODULE,

	.open		= simple_open,

	.read		= force_poll_sync_read,

	.write		= force_poll_sync_write,

net/bluetooth/mgmt.c

+5 −0
Original line number Diff line number Diff line
@@ -9660,6 +9660,9 @@ void mgmt_device_connected(struct hci_dev *hdev, struct hci_conn *conn, 
				     sizeof(*ev) + (name ? eir_precalc_len(name_len) : 0) +

				     eir_precalc_len(sizeof(conn->dev_class)));



	if (!skb)

		return;



	ev = skb_put(skb, sizeof(*ev));

	bacpy(&ev->addr.bdaddr, &conn->dst);

	ev->addr.type = link_to_bdaddr(conn->type, conn->dst_type);
@@ -10413,6 +10416,8 @@ void mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 


	skb = mgmt_alloc_skb(hdev, MGMT_EV_DEVICE_FOUND,

			     sizeof(*ev) + (name ? eir_precalc_len(name_len) : 0));

	if (!skb)

		return;



	ev = skb_put(skb, sizeof(*ev));

	bacpy(&ev->addr.bdaddr, bdaddr);