History

Merge tag 'for-net-2021-06-03' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth

bluetooth pull request for net: - Fixes UAF and CVE-2021-3564 - Fix VIRTIO_ID_BT to use an unassigned ID - Fix firmware loading on some Intel Controllers

David S. Miller committed 5 years ago

Commit 579028d2 parents 1a80242 1f14a624 files · +30 −6Browse files

Showing the changes to include/uapi/linux (1 of 4 files). Show all

Unified · Split

include/uapi/linux/virtio_ids.h+1−1
@@ -54,7 +54,7 @@ · 53 unmodified lines
5454 #define VIRTIO_ID_SOUND 25 /* virtio sound */
5555 #define VIRTIO_ID_FS 26 /* virtio filesystem */
5656 #define VIRTIO_ID_PMEM 27 /* virtio pmem */
57−#define VIRTIO_ID_BT 28 /* virtio bluetooth */
5857 #define VIRTIO_ID_MAC80211_HWSIM 29 /* virtio mac80211-hwsim */
58+#define VIRTIO_ID_BT 40 /* virtio bluetooth */
5959
6060 #endif /* _LINUX_VIRTIO_IDS_H */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t