summaryrefslogtreecommitdiff
path: root/net/bluetooth/hci_sock.c
diff options
context:
space:
mode:
authorRaghuram Subramani <raghus2247@gmail.com>2024-10-13 13:36:36 +0530
committerRaghuram Subramani <raghus2247@gmail.com>2024-10-13 13:36:36 +0530
commit6a21d8496b038d1e71fd6a9bd8a95880135665d9 (patch)
tree8f96e9273400c0eb8794f92aef733bb5fe52b658 /net/bluetooth/hci_sock.c
parentb73f506bc0ae7119f5f629b222596a27d7b2e99b (diff)
parent17d850f5a5bc1318b67a974b16d32a2dd3bab5cf (diff)
Merge remote-tracking branch 'msm8998/lineage-20'master
Diffstat (limited to 'net/bluetooth/hci_sock.c')
-rw-r--r--net/bluetooth/hci_sock.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index f84cfd0d4c65..6ab9dda306b9 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -333,7 +333,8 @@ static struct sk_buff *create_monitor_event(struct hci_dev *hdev, int event)
ni->type = hdev->dev_type;
ni->bus = hdev->bus;
bacpy(&ni->bdaddr, &hdev->bdaddr);
- memcpy(ni->name, hdev->name, 8);
+ memcpy_and_pad(ni->name, sizeof(ni->name), hdev->name,
+ strnlen(hdev->name, sizeof(ni->name)), '\0');
opcode = cpu_to_le16(HCI_MON_NEW_INDEX);
break;