diff options
| author | Richard Henderson | 2021-11-19 11:01:46 +0100 |
|---|---|---|
| committer | Richard Henderson | 2021-11-19 11:01:46 +0100 |
| commit | 9c25e1db18d872cbab3f028f93db37931dbc6ae2 (patch) | |
| tree | ade57d02097d43ea1f5a1082fe6b2a9ebb91712a /hw/core/machine.c | |
| parent | Merge tag 'net-pull-request' of https://github.com/jasowang/qemu into staging (diff) | |
| parent | hw/nvme: fix buffer overrun in nvme_changed_nslist (CVE-2021-3947) (diff) | |
| download | qemu-9c25e1db18d872cbab3f028f93db37931dbc6ae2.tar.gz qemu-9c25e1db18d872cbab3f028f93db37931dbc6ae2.tar.xz qemu-9c25e1db18d872cbab3f028f93db37931dbc6ae2.zip | |
Merge tag 'nvme-fixes-for-6.2-pull-request' of git://git.infradead.org/qemu-nvme into staging
hw/nvme fixes
* Fix CVE-2021-3947
* Controller hotplugging fixes
# gpg: Signature made Fri 19 Nov 2021 08:59:03 AM CET
# gpg: using RSA key 522833AA75E2DCE6A24766C04DE1AF316D4F0DE9
# gpg: Good signature from "Klaus Jensen <its@irrelevant.dk>" [unknown]
# gpg: aka "Klaus Jensen <k.jensen@samsung.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: DDCA 4D9C 9EF9 31CC 3468 4272 63D5 6FC5 E55D A838
# Subkey fingerprint: 5228 33AA 75E2 DCE6 A247 66C0 4DE1 AF31 6D4F 0DE9
* tag 'nvme-fixes-for-6.2-pull-request' of git://git.infradead.org/qemu-nvme:
hw/nvme: fix buffer overrun in nvme_changed_nslist (CVE-2021-3947)
hw/nvme: change nvme-ns 'shared' default
hw/nvme: reattach subsystem namespaces on hotplug
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'hw/core/machine.c')
| -rw-r--r-- | hw/core/machine.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/core/machine.c b/hw/core/machine.c index 26ec54e726..53a99abc56 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -39,6 +39,7 @@ GlobalProperty hw_compat_6_1[] = { { "vhost-user-vsock-device", "seqpacket", "off" }, + { "nvme-ns", "shared", "off" }, }; const size_t hw_compat_6_1_len = G_N_ELEMENTS(hw_compat_6_1); |