diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2014-09-29 09:06:22 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2014-10-03 10:30:33 +0100 |
| commit | 18fe46d79a6de61cb2c379fb610d834ef658d84b (patch) | |
| tree | 71e3ede0355d954c5c8639a72f601f259826d15c | |
| parent | af957387547b05ed6dc4d84c10cca42700a7aeda (diff) | |
| download | qemu-18fe46d79a6de61cb2c379fb610d834ef658d84b.zip qemu-18fe46d79a6de61cb2c379fb610d834ef658d84b.tar.gz qemu-18fe46d79a6de61cb2c379fb610d834ef658d84b.tar.bz2 | |
ssh: Don't crash if either host or path is not specified.
$ ./qemu-img create -f qcow2 overlay \
-b 'json: { "file.driver":"ssh",
"file.host":"localhost",
"file.host_key_check":"no" }'
qemu-img: qobject/qdict.c:193: qdict_get_obj: Assertion `obj != ((void *)0)' failed.
Aborted
A similar crash also happens if the file.host field is omitted.
https://bugzilla.redhat.com/show_bug.cgi?id=1147343
Bug found and reported by Jun Li.
Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
Reviewed-by: Gonglei <arei.gonglei@huawei.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| -rw-r--r-- | block/ssh.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/block/ssh.c b/block/ssh.c index cf43bc0..f466cbf 100644 --- a/block/ssh.c +++ b/block/ssh.c @@ -517,6 +517,11 @@ static int connect_to_ssh(BDRVSSHState *s, QDict *options, const char *host, *user, *path, *host_key_check; int port; + if (!qdict_haskey(options, "host")) { + ret = -EINVAL; + error_setg(errp, "No hostname was specified"); + goto err; + } host = qdict_get_str(options, "host"); if (qdict_haskey(options, "port")) { @@ -525,6 +530,11 @@ static int connect_to_ssh(BDRVSSHState *s, QDict *options, port = 22; } + if (!qdict_haskey(options, "path")) { + ret = -EINVAL; + error_setg(errp, "No path was specified"); + goto err; + } path = qdict_get_str(options, "path"); if (qdict_haskey(options, "user")) { |