05bba0
From bd7acae27a2bc4bc1a7865fdaeb30fd9c3a0430c Mon Sep 17 00:00:00 2001
05bba0
From: Richard Jones <rjones@redhat.com>
05bba0
Date: Mon, 8 Jun 2015 11:56:58 +0200
05bba0
Subject: [PATCH 05/30] block/ssh: Propagate errors through connect_to_ssh()
05bba0
05bba0
Message-id: <1433764620-20506-5-git-send-email-rjones@redhat.com>
05bba0
Patchwork-id: 65480
05bba0
O-Subject: [RHEL-7.2 qemu-kvm PATCH 4/6] block/ssh: Propagate errors through connect_to_ssh()
05bba0
Bugzilla: 1226683
05bba0
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
05bba0
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
05bba0
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
05bba0
05bba0
From: Markus Armbruster <armbru@redhat.com>
05bba0
05bba0
Signed-off-by: Markus Armbruster <armbru@redhat.com>
05bba0
Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
05bba0
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
05bba0
05bba0
Upstream-status: 5f0c39e59822fdfd6a730824eded06209942e495
05bba0
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
05bba0
---
05bba0
 block/ssh.c | 34 +++++++++++++++++-----------------
05bba0
 1 file changed, 17 insertions(+), 17 deletions(-)
05bba0
05bba0
diff --git a/block/ssh.c b/block/ssh.c
05bba0
index 5908e6d..07f8a2c 100644
05bba0
--- a/block/ssh.c
05bba0
+++ b/block/ssh.c
05bba0
@@ -506,10 +506,9 @@ static int authenticate(BDRVSSHState *s, const char *user, Error **errp)
05bba0
 }
05bba0
 
05bba0
 static int connect_to_ssh(BDRVSSHState *s, QDict *options,
05bba0
-                          int ssh_flags, int creat_mode)
05bba0
+                          int ssh_flags, int creat_mode, Error **errp)
05bba0
 {
05bba0
     int r, ret;
05bba0
-    Error *err = NULL;
05bba0
     const char *host, *user, *path, *host_key_check;
05bba0
     int port;
05bba0
 
05bba0
@@ -528,6 +527,7 @@ static int connect_to_ssh(BDRVSSHState *s, QDict *options,
05bba0
     } else {
05bba0
         user = g_get_user_name();
05bba0
         if (!user) {
05bba0
+            error_setg_errno(errp, errno, "Can't get user name");
05bba0
             ret = -errno;
05bba0
             goto err;
05bba0
         }
05bba0
@@ -544,11 +544,9 @@ static int connect_to_ssh(BDRVSSHState *s, QDict *options,
05bba0
     s->hostport = g_strdup_printf("%s:%d", host, port);
05bba0
 
05bba0
     /* Open the socket and connect. */
05bba0
-    s->sock = inet_connect(s->hostport, &err);
05bba0
-    if (err != NULL) {
05bba0
+    s->sock = inet_connect(s->hostport, errp);
05bba0
+    if (s->sock < 0) {
05bba0
         ret = -errno;
05bba0
-        qerror_report_err(err);
05bba0
-        error_free(err);
05bba0
         goto err;
05bba0
     }
05bba0
 
05bba0
@@ -556,7 +554,7 @@ static int connect_to_ssh(BDRVSSHState *s, QDict *options,
05bba0
     s->session = libssh2_session_init();
05bba0
     if (!s->session) {
05bba0
         ret = -EINVAL;
05bba0
-        session_error_report(s, "failed to initialize libssh2 session");
05bba0
+        session_error_setg(errp, s, "failed to initialize libssh2 session");
05bba0
         goto err;
05bba0
     }
05bba0
 
05bba0
@@ -567,30 +565,26 @@ static int connect_to_ssh(BDRVSSHState *s, QDict *options,
05bba0
     r = libssh2_session_handshake(s->session, s->sock);
05bba0
     if (r != 0) {
05bba0
         ret = -EINVAL;
05bba0
-        session_error_report(s, "failed to establish SSH session");
05bba0
+        session_error_setg(errp, s, "failed to establish SSH session");
05bba0
         goto err;
05bba0
     }
05bba0
 
05bba0
     /* Check the remote host's key against known_hosts. */
05bba0
-    ret = check_host_key(s, host, port, host_key_check, &err);
05bba0
+    ret = check_host_key(s, host, port, host_key_check, errp);
05bba0
     if (ret < 0) {
05bba0
-        qerror_report_err(err);
05bba0
-        error_free(err);
05bba0
         goto err;
05bba0
     }
05bba0
 
05bba0
     /* Authenticate. */
05bba0
-    ret = authenticate(s, user, &err);
05bba0
+    ret = authenticate(s, user, errp);
05bba0
     if (ret < 0) {
05bba0
-        qerror_report_err(err);
05bba0
-        error_free(err);
05bba0
         goto err;
05bba0
     }
05bba0
 
05bba0
     /* Start SFTP. */
05bba0
     s->sftp = libssh2_sftp_init(s->session);
05bba0
     if (!s->sftp) {
05bba0
-        session_error_report(s, "failed to initialize sftp handle");
05bba0
+        session_error_setg(errp, s, "failed to initialize sftp handle");
05bba0
         ret = -EINVAL;
05bba0
         goto err;
05bba0
     }
05bba0
@@ -645,6 +639,7 @@ static int connect_to_ssh(BDRVSSHState *s, QDict *options,
05bba0
 static int ssh_file_open(BlockDriverState *bs, QDict *options, int bdrv_flags,
05bba0
                          Error **errp)
05bba0
 {
05bba0
+    Error *local_err = NULL;
05bba0
     BDRVSSHState *s = bs->opaque;
05bba0
     int ret;
05bba0
     int ssh_flags;
05bba0
@@ -657,8 +652,10 @@ static int ssh_file_open(BlockDriverState *bs, QDict *options, int bdrv_flags,
05bba0
     }
05bba0
 
05bba0
     /* Start up SSH. */
05bba0
-    ret = connect_to_ssh(s, options, ssh_flags, 0);
05bba0
+    ret = connect_to_ssh(s, options, ssh_flags, 0, &local_err);
05bba0
     if (ret < 0) {
05bba0
+        qerror_report_err(local_err);
05bba0
+        error_free(local_err);
05bba0
         goto err;
05bba0
     }
05bba0
 
05bba0
@@ -718,8 +715,11 @@ static int ssh_create(const char *filename, QEMUOptionParameter *options,
05bba0
 
05bba0
     r = connect_to_ssh(&s, uri_options,
05bba0
                        LIBSSH2_FXF_READ|LIBSSH2_FXF_WRITE|
05bba0
-                       LIBSSH2_FXF_CREAT|LIBSSH2_FXF_TRUNC, 0644);
05bba0
+                       LIBSSH2_FXF_CREAT|LIBSSH2_FXF_TRUNC,
05bba0
+                       0644, &local_err);
05bba0
     if (r < 0) {
05bba0
+        qerror_report_err(local_err);
05bba0
+        error_free(local_err);
05bba0
         ret = r;
05bba0
         goto out;
05bba0
     }
05bba0
-- 
05bba0
1.8.3.1
05bba0