Branch: refs/heads/master Home: https://github.com/qemu/qemu Commit: fbd5c4c0db47e578e3fdd88a0ebc4314a1ed3d42 https://github.com/qemu/qemu/commit/fbd5c4c0db47e578e3fdd88a0ebc4314a1ed3d42 Author: Murilo Opsfelder Araujo <muri...@linux.vnet.ibm.com> Date: 2018-01-31 (Wed, 31 Jan 2018)
Changed paths: M block/ssh.c Log Message: ----------- block/ssh: fix possible segmentation fault when .desc is not null-terminated This patch prevents a possible segmentation fault when .desc members are checked against NULL. The ssh_runtime_opts was added by commit 8a6a80896d6af03b8ee0c17cdf37219eca2588a7 ("block/ssh: Use QemuOpts for runtime options"). This fix was inspired by http://lists.nongnu.org/archive/html/qemu-devel/2018-01/msg00883.html. Fixes: 8a6a80896d6af03b8ee0c17cdf37219eca2588a7 ("block/ssh: Use QemuOpts for runtime options") Cc: Max Reitz <mre...@redhat.com> Cc: Eric Blake <ebl...@redhat.com> Signed-off-by: Murilo Opsfelder Araujo <muri...@linux.vnet.ibm.com> Reviewed-by: Eric Blake <ebl...@redhat.com> Reviewed-by: Jeff Cody <jc...@redhat.com> Signed-off-by: Jeff Cody <jc...@redhat.com> Commit: 45a79646ea746fa3f32083d0aa70512aae29f6b3 https://github.com/qemu/qemu/commit/45a79646ea746fa3f32083d0aa70512aae29f6b3 Author: Max Reitz <mre...@redhat.com> Date: 2018-01-31 (Wed, 31 Jan 2018) Changed paths: M tests/qemu-iotests/200 Log Message: ----------- iotests: Make 200 run on tmpfs 200 currently fails on tmpfs because it sets cache=none. However, without that (and aio=native), the test still works now and it fails before Jeff's series (on fc7dbc119e0852a70dc9fa68bb41a318e49e4cd6). So we can probably remove the aio=native safely, and replace cache=none by cache=$CACHEMODE. Signed-off-by: Max Reitz <mre...@redhat.com> Reviewed-by: Jeff Cody <jc...@redhat.com> Message-id: 20180117135015.15051-1-mre...@redhat.com Signed-off-by: Jeff Cody <jc...@redhat.com> Commit: 707eafb8b082b45504e95c1705816fc190e23247 https://github.com/qemu/qemu/commit/707eafb8b082b45504e95c1705816fc190e23247 Author: Peter Maydell <peter.mayd...@linaro.org> Date: 2018-02-02 (Fri, 02 Feb 2018) Changed paths: M block/ssh.c M tests/qemu-iotests/200 Log Message: ----------- Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging # gpg: Signature made Thu 01 Feb 2018 04:05:22 GMT # gpg: using RSA key BDBE7B27C0DE3057 # gpg: Good signature from "Jeffrey Cody <jc...@redhat.com>" # gpg: aka "Jeffrey Cody <j...@codyprime.org>" # gpg: aka "Jeffrey Cody <codypr...@gmail.com>" # Primary key fingerprint: 9957 4B4D 3474 90E7 9D98 D624 BDBE 7B27 C0DE 3057 * remotes/cody/tags/block-pull-request: iotests: Make 200 run on tmpfs block/ssh: fix possible segmentation fault when .desc is not null-terminated Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> Compare: https://github.com/qemu/qemu/compare/b05631954d6d...707eafb8b082