From patchwork Tue Aug 8 13:39:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Cody X-Patchwork-Id: 799174 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xRbBN06Pmz9s65 for ; Tue, 8 Aug 2017 23:40:26 +1000 (AEST) Received: from localhost ([::1]:42634 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1df4kB-00063K-Tu for incoming@patchwork.ozlabs.org; Tue, 08 Aug 2017 09:40:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33220) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1df4jK-0005oT-Ij for qemu-devel@nongnu.org; Tue, 08 Aug 2017 09:39:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1df4jE-0008Ch-Ki for qemu-devel@nongnu.org; Tue, 08 Aug 2017 09:39:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33808) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1df4j4-00083l-46; Tue, 08 Aug 2017 09:39:14 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4A0A7356D0; Tue, 8 Aug 2017 13:39:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 4A0A7356D0 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=jcody@redhat.com Received: from localhost (ovpn-116-54.phx2.redhat.com [10.3.116.54]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0D83C5F92A; Tue, 8 Aug 2017 13:39:10 +0000 (UTC) From: Jeff Cody To: qemu-devel@nongnu.org Date: Tue, 8 Aug 2017 09:39:03 -0400 Message-Id: <4d5999f33db7bd8433a80a9ea0f776fdef340ac1.1502198932.git.jcody@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 08 Aug 2017 13:39:11 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for-2.11 2/7] block/ssh: make compliant with coding guidelines X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mitake.hitoshi@lab.ntt.co.jp, namei.unix@gmail.com, kwolf@redhat.com, rjones@redhat.com, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Jeff Cody --- block/ssh.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/block/ssh.c b/block/ssh.c index cbb0e34..97f7673 100644 --- a/block/ssh.c +++ b/block/ssh.c @@ -241,7 +241,7 @@ static int parse_uri(const char *filename, QDict *options, Error **errp) goto err; } - if(uri->user && strcmp(uri->user, "") != 0) { + if (uri->user && strcmp(uri->user, "") != 0) { qdict_put_str(options, "user", uri->user); } @@ -268,7 +268,7 @@ static int parse_uri(const char *filename, QDict *options, Error **errp) err: if (uri) { - uri_free(uri); + uri_free(uri); } return -EINVAL; } @@ -342,7 +342,7 @@ static int check_host_key_knownhosts(BDRVSSHState *s, libssh2_knownhost_readfile(knh, knh_file, LIBSSH2_KNOWNHOST_FILE_OPENSSH); r = libssh2_knownhost_checkp(knh, host, port, hostkey, len, - LIBSSH2_KNOWNHOST_TYPE_PLAIN| + LIBSSH2_KNOWNHOST_TYPE_PLAIN | LIBSSH2_KNOWNHOST_KEYENC_RAW, &found); switch (r) { @@ -405,15 +405,18 @@ static int compare_fingerprint(const unsigned char *fingerprint, size_t len, unsigned c; while (len > 0) { - while (*host_key_check == ':') + while (*host_key_check == ':') { host_key_check++; + } if (!qemu_isxdigit(host_key_check[0]) || - !qemu_isxdigit(host_key_check[1])) + !qemu_isxdigit(host_key_check[1])) { return 1; + } c = hex2decimal(host_key_check[0]) * 16 + hex2decimal(host_key_check[1]); - if (c - *fingerprint != 0) + if (c - *fingerprint != 0) { return c - *fingerprint; + } fingerprint++; len--; host_key_check += 2; @@ -433,8 +436,8 @@ check_host_key_hash(BDRVSSHState *s, const char *hash, return -EINVAL; } - if(compare_fingerprint((unsigned char *) fingerprint, fingerprint_len, - hash) != 0) { + if (compare_fingerprint((unsigned char *) fingerprint, fingerprint_len, + hash) != 0) { error_setg(errp, "remote host key does not match host_key_check '%s'", hash); return -EPERM; @@ -507,7 +510,7 @@ static int authenticate(BDRVSSHState *s, const char *user, Error **errp) goto out; } - for(;;) { + for (;;) { r = libssh2_agent_get_identity(agent, &identity, prev_identity); if (r == 1) { /* end of list */ break; @@ -863,8 +866,8 @@ static int ssh_create(const char *filename, QemuOpts *opts, Error **errp) } r = connect_to_ssh(&s, uri_options, - LIBSSH2_FXF_READ|LIBSSH2_FXF_WRITE| - LIBSSH2_FXF_CREAT|LIBSSH2_FXF_TRUNC, + LIBSSH2_FXF_READ | LIBSSH2_FXF_WRITE | + LIBSSH2_FXF_CREAT | LIBSSH2_FXF_TRUNC, 0644, errp); if (r < 0) { ret = r; @@ -872,7 +875,7 @@ static int ssh_create(const char *filename, QemuOpts *opts, Error **errp) } if (total_size > 0) { - libssh2_sftp_seek64(s.sftp_handle, total_size-1); + libssh2_sftp_seek64(s.sftp_handle, total_size - 1); r2 = libssh2_sftp_write(s.sftp_handle, c, 1); if (r2 < 0) { sftp_error_setg(errp, &s, "truncate failed"); @@ -1111,7 +1114,7 @@ static int ssh_write(BDRVSSHState *s, BlockDriverState *bs, * works for me. */ if (r == 0) { - ssh_seek(s, offset + written, SSH_SEEK_WRITE|SSH_SEEK_FORCE); + ssh_seek(s, offset + written, SSH_SEEK_WRITE | SSH_SEEK_FORCE); co_yield(s, bs); goto again; } @@ -1125,8 +1128,9 @@ static int ssh_write(BDRVSSHState *s, BlockDriverState *bs, end_of_vec = i->iov_base + i->iov_len; } - if (offset + written > s->attrs.filesize) + if (offset + written > s->attrs.filesize) { s->attrs.filesize = offset + written; + } } return 0;