[Qemu-commits] [qemu/qemu] 9fc6e8: hw/nvme: reattach subsystem namespaces on hotplug

[Richard Henderson]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 9fc6e86e8b69e2e672cbb9c25cddc3b9deb96afb
      
https://github.com/qemu/qemu/commit/9fc6e86e8b69e2e672cbb9c25cddc3b9deb96afb
  Author: Hannes Reinecke <hare@suse.de>
  Date:   2021-11-19 (Fri, 19 Nov 2021)

  Changed paths:
    M hw/nvme/subsys.c

  Log Message:
  -----------
  hw/nvme: reattach subsystem namespaces on hotplug

With commit 5ffbaeed16 ("hw/nvme: fix controller hot unplugging")
namespaces get moved from the controller to the subsystem if one
is specified.
That keeps the namespaces alive after a controller hot-unplug, but
after a controller hotplug we have to reconnect the namespaces
from the subsystem to the controller.

Fixes: 5ffbaeed16 ("hw/nvme: fix controller hot unplugging")
Cc: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Hannes Reinecke <hare@suse.de>
[k.jensen: only attach to shared and non-detached namespaces]
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>


  Commit: 916b0f0b5264759c581badfdc0e1c5f98362dbda
      
https://github.com/qemu/qemu/commit/916b0f0b5264759c581badfdc0e1c5f98362dbda
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2021-11-19 (Fri, 19 Nov 2021)

  Changed paths:
    M docs/system/devices/nvme.rst
    M hw/core/machine.c
    M hw/nvme/ns.c

  Log Message:
  -----------
  hw/nvme: change nvme-ns 'shared' default

Change namespaces to be shared namespaces by default (parameter
shared=on). Keep shared=off for older machine types.

Reviewed-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>


  Commit: e2c57529c9306e4c9aac75d9879f6e7699584a22
      
https://github.com/qemu/qemu/commit/e2c57529c9306e4c9aac75d9879f6e7699584a22
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2021-11-19 (Fri, 19 Nov 2021)

  Changed paths:
    M hw/nvme/ctrl.c

  Log Message:
  -----------
  hw/nvme: fix buffer overrun in nvme_changed_nslist (CVE-2021-3947)

Fix missing offset verification.

Cc: qemu-stable@nongnu.org
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Reported-by: Qiuhao Li <Qiuhao.Li@outlook.com>
Fixes: f432fdfa121 ("support changed namespace asynchronous event")
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>


  Commit: 9c25e1db18d872cbab3f028f93db37931dbc6ae2
      
https://github.com/qemu/qemu/commit/9c25e1db18d872cbab3f028f93db37931dbc6ae2
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2021-11-19 (Fri, 19 Nov 2021)

  Changed paths:
    M docs/system/devices/nvme.rst
    M hw/core/machine.c
    M hw/nvme/ctrl.c
    M hw/nvme/ns.c
    M hw/nvme/subsys.c

  Log Message:
  -----------
  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>


Compare: https://github.com/qemu/qemu/compare/3760a04c352f...9c25e1db18d8