diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2021-12-19 16:36:10 -0800 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2021-12-19 16:36:10 -0800 |
| commit | 212a33d3b0c65ae2583bb1d06cb140cd0890894c (patch) | |
| tree | c016a716941664aaca665161fd938ea6b3bd4550 /hw/scsi | |
| parent | 90978e15bc9a23c208b25bf7ea697a5d0925562b (diff) | |
| parent | 5a3a2eb3b1096a52580c1b8c3eb0739714e7d941 (diff) | |
| download | focaccia-qemu-212a33d3b0c65ae2583bb1d06cb140cd0890894c.tar.gz focaccia-qemu-212a33d3b0c65ae2583bb1d06cb140cd0890894c.zip | |
Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging
* configure and meson cleanups and fixes * remove unnecessary #ifdef * SCSI and i386 fixes # gpg: Signature made Sat 18 Dec 2021 02:00:22 AM PST # gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83 # gpg: issuer "pbonzini@redhat.com" # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [unknown] # gpg: aka "Paolo Bonzini <pbonzini@redhat.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: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1 # Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83 * tag 'for-upstream' of https://gitlab.com/bonzini/qemu: hw/i386/vmmouse: Require 'i8042' property to be set tests/qtest/fuzz-megasas-test: Add test for GitLab issue #521 hw/scsi/megasas: Fails command if SGL buffer overflows hw/scsi: Fix scsi_bus_init_named() docstring meson: add "check" argument to run_command cpu: remove unnecessary #ifdef CONFIG_TCG meson: reenable test-fdmon-epoll configure: remove DIRS configure: remove unnecessary symlinks configure, meson: move ARCH to meson.build meson: rename "arch" variable configure: unify x86_64 and x32 configure: unify ppc64 and ppc64le configure: unify two case statements on $cpu configure: move target detection before CPU detection configure: make $targetos lowercase, use windows instead of MINGW32 Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'hw/scsi')
| -rw-r--r-- | hw/scsi/megasas.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 4ff51221d4..8f35784100 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -303,6 +303,7 @@ static int megasas_map_sgl(MegasasState *s, MegasasCmd *cmd, union mfi_sgl *sgl) } if (cmd->iov_size > iov_size) { trace_megasas_iovec_overflow(cmd->index, iov_size, cmd->iov_size); + goto unmap; } else if (cmd->iov_size < iov_size) { trace_megasas_iovec_underflow(cmd->index, iov_size, cmd->iov_size); } |