| Message ID | 1411977982-2093-1-git-send-email-rjones@redhat.com |
|---|---|
| State | New |
| Headers | show |
> -----Original Message----- > From: Richard W.M. Jones [mailto:rjones@redhat.com] > Sent: Monday, September 29, 2014 4:06 PM > To: qemu-devel@nongnu.org > Cc: Gonglei (Arei) > Subject: [PATCH v2] 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> > --- > block/ssh.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > Cc'ing Stefan and Kevin. You can add the change log between v1 and v2. Anyway, looks good to me, so Reviewed-by: Gonglei <arei.gonglei@huawei.com> Best regards, -Gonglei
On Mon, Sep 29, 2014 at 09:06:22AM +0100, Richard W.M. Jones wrote: > $ ./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> > --- > block/ssh.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) Please CC Kevin Wolf and me on block patches. Thanks, applied to my block tree: https://github.com/stefanha/qemu/commits/block Stefan
diff --git a/block/ssh.c b/block/ssh.c index cd2fd75..35f143d 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")) {
$ ./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> --- block/ssh.c | 10 ++++++++++ 1 file changed, 10 insertions(+)