diff options
| author | David S. Miller <davem@davemloft.net> | 2021-06-04 01:32:21 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-06-04 01:32:21 +0300 |
| commit | 579028dec182c026b9a85725682f1dfbdc825eaa (patch) | |
| tree | 3364b345a8bab030dbbaae29797d42f875e1cb81 /include/uapi/linux | |
| parent | 1a8024239dacf53fcf39c0f07fbf2712af22864f (diff) | |
| parent | 1f14a620f30b01234f8b61df396f513e2ec4887f (diff) | |
| download | linux-579028dec182c026b9a85725682f1dfbdc825eaa.tar.xz | |
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
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/virtio_ids.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/virtio_ids.h b/include/uapi/linux/virtio_ids.h index f0c35ce8628c..4fe842c3a3a9 100644 --- a/include/uapi/linux/virtio_ids.h +++ b/include/uapi/linux/virtio_ids.h @@ -54,7 +54,7 @@ #define VIRTIO_ID_SOUND 25 /* virtio sound */ #define VIRTIO_ID_FS 26 /* virtio filesystem */ #define VIRTIO_ID_PMEM 27 /* virtio pmem */ -#define VIRTIO_ID_BT 28 /* virtio bluetooth */ #define VIRTIO_ID_MAC80211_HWSIM 29 /* virtio mac80211-hwsim */ +#define VIRTIO_ID_BT 40 /* virtio bluetooth */ #endif /* _LINUX_VIRTIO_IDS_H */ |