From nobody Tue May 13 15:53:30 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1538727155065640.5635660317836; Fri, 5 Oct 2018 01:12:35 -0700 (PDT) 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 57DAF3001943; Fri, 5 Oct 2018 08:12:33 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0E5025D9CC; Fri, 5 Oct 2018 08:12:33 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A8D923D390; Fri, 5 Oct 2018 08:12:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w958CML6009602 for ; Fri, 5 Oct 2018 04:12:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id EA054308BDA4; Fri, 5 Oct 2018 08:12:22 +0000 (UTC) Received: from mx1.redhat.com (ext-mx03.extmail.prod.ext.phx2.redhat.com [10.5.110.27]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E1D38308BDA1 for ; Fri, 5 Oct 2018 08:12:22 +0000 (UTC) Received: from m97138.mail.qiye.163.com (m97138.mail.qiye.163.com [220.181.97.138]) by mx1.redhat.com (Postfix) with ESMTP id A2BBF83F51 for ; Fri, 5 Oct 2018 08:12:12 +0000 (UTC) Received: from localhost.localdomain (unknown [58.56.27.130]) by smtp9 (Coremail) with SMTP id u+CowAB3p3_PHLdb0blTAg--.62652S14; Fri, 05 Oct 2018 16:12:02 +0800 (CST) From: Shi Lei To: libvir-list@redhat.com Date: Fri, 5 Oct 2018 16:11:35 +0800 Message-Id: <20181005081145.29901-13-shi_lei@massclouds.com> In-Reply-To: <20181005081145.29901-1-shi_lei@massclouds.com> References: <20181005081145.29901-1-shi_lei@massclouds.com> X-CM-TRANSID: u+CowAB3p3_PHLdb0blTAg--.62652S14 X-Coremail-Antispam: 1Uf129KBjvJXoW3Xry5Wr4kXr4fWFyDGr1fCrg_yoW7XFykpw nrAFs09r9YvF47ZanxJFy5Gw1fAFnYgr15K392g3s7Ww4DC34xJF42kFy8t398Zry5Ja4a q3Z09345Ca15JFDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0piqg43UUUUU= X-Originating-IP: [58.56.27.130] X-CM-SenderInfo: pvklsz1hl6ztxvvfz0xxgvhudrp/1tbieRLWT1qrhVi6hQAAsh X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 214 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 05 Oct 2018 08:12:21 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 05 Oct 2018 08:12:21 +0000 (UTC) for IP:'220.181.97.138' DOMAIN:'m97138.mail.qiye.163.com' HELO:'m97138.mail.qiye.163.com' FROM:'shi_lei@massclouds.com' RCPT:'' X-RedHat-Spam-Score: -0.01 (RCVD_IN_DNSWL_NONE) 220.181.97.138 m97138.mail.qiye.163.com 220.181.97.138 m97138.mail.qiye.163.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.27 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.24 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 12/22] rpc: Fix misaligned arguments X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com 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.40]); Fri, 05 Oct 2018 08:12:34 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This patch fixes misaligned arguments. Signed-off-by: Shi Lei --- src/rpc/virnetclient.c | 40 +++++++++++++++++++---------------- src/rpc/virnetlibsshsession.c | 2 +- src/rpc/virnetservermdns.c | 4 ++-- src/rpc/virnetsocket.c | 23 +++++++++++--------- src/rpc/virnetsshsession.c | 2 +- 5 files changed, 39 insertions(+), 32 deletions(-) diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index b4d8fb2..d2162d4 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -493,15 +493,17 @@ virNetClientPtr virNetClientNewLibSSH2(const char *ho= st, if (!(nc =3D virBufferContentAndReset(&buf))) goto no_memory; =20 - virBufferAsprintf(&buf, - "sh -c " - "'if '%s' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1= ; then " - "ARG=3D-q0;" - "else " - "ARG=3D;" - "fi;" - "'%s' $ARG -U %s'", - nc, nc, socketPath); +#define COMMAND_FORMAT "sh -c " \ + "'if '%s' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; the= n " \ + "ARG=3D-q0;" \ + "else " \ + "ARG=3D;" \ + "fi;" \ + "'%s' $ARG -U %s'" + + virBufferAsprintf(&buf, COMMAND_FORMAT, nc, nc, socketPath); + +#undef COMMAND_FORMAT =20 if (!(command =3D virBufferContentAndReset(&buf))) goto no_memory; @@ -601,17 +603,19 @@ virNetClientPtr virNetClientNewLibssh(const char *hos= t, if (!(nc =3D virBufferContentAndReset(&buf))) goto no_memory; =20 - if (virAsprintf(&command, - "sh -c " - "'if '%s' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1= ; then " - "ARG=3D-q0;" - "else " - "ARG=3D;" - "fi;" - "'%s' $ARG -U %s'", - nc, nc, socketPath) < 0) +#define COMMAND_FORMAT "sh -c " \ + "'if '%s' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; the= n " \ + "ARG=3D-q0;" \ + "else " \ + "ARG=3D;" \ + "fi;" \ + "'%s' $ARG -U %s'" + + if (virAsprintf(&command, COMMAND_FORMAT, nc, nc, socketPath) < 0) goto cleanup; =20 +#undef COMMAND_FORMAT + if (virNetSocketNewConnectLibssh(host, port, family, username, privkey, diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index 7c5f158..2422150 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -1124,7 +1124,7 @@ virNetLibsshSessionAuthAddKeyboardAuth(virNetLibsshSe= ssionPtr sess, =20 int virNetLibsshSessionSetChannelCommand(virNetLibsshSessionPtr sess, - const char *command) + const char *command) { int ret =3D 0; virObjectLock(sess); diff --git a/src/rpc/virnetservermdns.c b/src/rpc/virnetservermdns.c index e0a9aef..3669998 100644 --- a/src/rpc/virnetservermdns.c +++ b/src/rpc/virnetservermdns.c @@ -347,8 +347,8 @@ static AvahiTimeout *virNetServerMDNSTimeoutNew(const A= vahiPoll *api ATTRIBUTE_U } =20 VIR_DEBUG("Trigger timed for %d %d %d %d", - (int)now.tv_sec, (int)now.tv_usec, - (int)(tv ? tv->tv_sec : 0), (int)(tv ? tv->tv_usec : 0)); + (int)now.tv_sec, (int)now.tv_usec, + (int)(tv ? tv->tv_sec : 0), (int)(tv ? tv->tv_usec : 0)); nowms =3D (now.tv_sec * 1000ll) + (now.tv_usec / 1000ll); if (tv) { thenms =3D (tv->tv_sec * 1000ll) + (tv->tv_usec/1000ll); diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 55de3b2..5fe0930 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -634,7 +634,7 @@ int virNetSocketNewConnectUNIX(const char *path, bool daemonLaunched =3D false; =20 VIR_DEBUG("path=3D%s spawnDaemon=3D%d binary=3D%s", path, spawnDaemon, - NULLSTR(binary)); + NULLSTR(binary)); =20 memset(&localAddr, 0, sizeof(localAddr)); memset(&remoteAddr, 0, sizeof(remoteAddr)); @@ -883,14 +883,17 @@ int virNetSocketNewConnectSSH(const char *nodename, * Fedora's 'nc' doesn't have this option, and defaults to the desired * behavior. */ - virCommandAddArgFormat(cmd, - "'if '%s' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1= ; then " - "ARG=3D-q0;" - "else " - "ARG=3D;" - "fi;" - "'%s' $ARG -U %s'", - quoted, quoted, path); +#define COMMAND_FORMAT "" \ + "'if '%s' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; the= n " \ + "ARG=3D-q0;" \ + "else " \ + "ARG=3D;" \ + "fi;" \ + "'%s' $ARG -U %s'" + + virCommandAddArgFormat(cmd, COMMAND_FORMAT, quoted, quoted, path); + +#undef COMMAND_FORMAT =20 VIR_FREE(quoted); return virNetSocketNewConnectCommand(cmd, retsock); @@ -1534,7 +1537,7 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, */ if (errno !=3D EOPNOTSUPP) { virReportSystemError(errno, "%s", - _("Failed to get client socket PID")); + _("Failed to get client socket PID")); goto cleanup; } } diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index 35dc6c5..1114036 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -462,7 +462,7 @@ virNetSSHCheckHostKey(virNetSSHSessionPtr sess) if (sess->knownHostsFile) { if (libssh2_knownhost_writefile(sess->knownHosts, sess->knownHostsFile, - LIBSSH2_KNOWNHOST_FILE_OPENSSH) <= 0) { + LIBSSH2_KNOWNHOST_FILE_OPENSSH= ) < 0) { libssh2_session_last_error(sess->session, &errmsg, NULL, 0= ); virReportError(VIR_ERR_SSH, _("failed to write known_host file '%s': %s= "), --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list