From nobody Sun Oct 5 21:14:38 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548112015850402.80953734379284; Mon, 21 Jan 2019 15:06:55 -0800 (PST) Received: from localhost ([127.0.0.1]:35656 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gliec-0006VN-N9 for importer@patchew.org; Mon, 21 Jan 2019 18:06:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40341) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gliO8-0001Rw-E9 for qemu-devel@nongnu.org; Mon, 21 Jan 2019 17:49:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gliO6-0005Ip-Pw for qemu-devel@nongnu.org; Mon, 21 Jan 2019 17:49:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37756) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gliNw-0004zE-MY; Mon, 21 Jan 2019 17:49:40 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EC3E48762D; Mon, 21 Jan 2019 22:49:22 +0000 (UTC) Received: from blue.redhat.com (ovpn-117-44.phx2.redhat.com [10.3.117.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9445360123; Mon, 21 Jan 2019 22:49:22 +0000 (UTC) From: Eric Blake To: qemu-devel@nongnu.org Date: Mon, 21 Jan 2019 16:48:58 -0600 Message-Id: <20190121224907.26634-13-eblake@redhat.com> In-Reply-To: <20190121224907.26634-1-eblake@redhat.com> References: <20190121224907.26634-1-eblake@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 21 Jan 2019 22:49:23 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 12/21] nbd/client: Split out nbd_receive_one_meta_context() 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: Vladimir Sementsov-Ogievskiy , "open list:Network Block Dev..." Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Extract portions of nbd_negotiate_simple_meta_context() to a new function nbd_receive_one_meta_context() that copies the pattern of nbd_receive_list() for performing the argument validation of one reply. The error message when the server replies with more than one context changes slightly, but that shouldn't happen in the common case. Signed-off-by: Eric Blake Reviewed-by: Vladimir Sementsov-Ogievskiy Message-Id: <20190117193658.16413-13-eblake@redhat.com> --- nbd/client.c | 147 +++++++++++++++++++++++++++++------------------ nbd/trace-events | 2 +- 2 files changed, 91 insertions(+), 58 deletions(-) diff --git a/nbd/client.c b/nbd/client.c index 96da68ee18a..c7bb7081553 100644 --- a/nbd/client.c +++ b/nbd/client.c @@ -669,7 +669,86 @@ static int nbd_send_meta_query(QIOChannel *ioc, uint32= _t opt, return ret; } -/* nbd_negotiate_simple_meta_context: +/* + * nbd_receive_one_meta_context: + * Called in a loop to receive and trace one set/list meta context reply. + * Pass non-NULL @name or @id to collect results back to the caller, which + * must eventually call g_free(). + * return 1 if name is set and iteration must continue, + * 0 if iteration is complete (including if option is unsupported), + * -1 with errp set for any error + */ +static int nbd_receive_one_meta_context(QIOChannel *ioc, + uint32_t opt, + char **name, + uint32_t *id, + Error **errp) +{ + int ret; + NBDOptionReply reply; + char *local_name =3D NULL; + uint32_t local_id; + + if (nbd_receive_option_reply(ioc, opt, &reply, errp) < 0) { + return -1; + } + + ret =3D nbd_handle_reply_err(ioc, &reply, errp); + if (ret <=3D 0) { + return ret; + } + + if (reply.type =3D=3D NBD_REP_ACK) { + if (reply.length !=3D 0) { + error_setg(errp, "Unexpected length to ACK response"); + nbd_send_opt_abort(ioc); + return -1; + } + return 0; + } else if (reply.type !=3D NBD_REP_META_CONTEXT) { + error_setg(errp, "Unexpected reply type %u (%s), expected %u (%s)", + reply.type, nbd_rep_lookup(reply.type), + NBD_REP_META_CONTEXT, nbd_rep_lookup(NBD_REP_META_CONTE= XT)); + nbd_send_opt_abort(ioc); + return -1; + } + + if (reply.length <=3D sizeof(local_id) || + reply.length > NBD_MAX_BUFFER_SIZE) { + error_setg(errp, "Failed to negotiate meta context, server " + "answered with unexpected length %" PRIu32, + reply.length); + nbd_send_opt_abort(ioc); + return -1; + } + + if (nbd_read(ioc, &local_id, sizeof(local_id), errp) < 0) { + return -1; + } + local_id =3D be32_to_cpu(local_id); + + reply.length -=3D sizeof(local_id); + local_name =3D g_malloc(reply.length + 1); + if (nbd_read(ioc, local_name, reply.length, errp) < 0) { + g_free(local_name); + return -1; + } + local_name[reply.length] =3D '\0'; + trace_nbd_opt_meta_reply(nbd_opt_lookup(opt), local_name, local_id); + + if (name) { + *name =3D local_name; + } else { + g_free(local_name); + } + if (id) { + *id =3D local_id; + } + return 1; +} + +/* + * nbd_negotiate_simple_meta_context: * Request the server to set the meta context for export @info->name * using @info->x_dirty_bitmap with a fallback to "base:allocation", * setting @info->context_id to the resulting id. Fail if the server @@ -690,50 +769,21 @@ static int nbd_negotiate_simple_meta_context(QIOChann= el *ioc, * function should lose the term _simple. */ int ret; - NBDOptionReply reply; const char *context =3D info->x_dirty_bitmap ?: "base:allocation"; bool received =3D false; + char *name =3D NULL; if (nbd_send_meta_query(ioc, NBD_OPT_SET_META_CONTEXT, info->name, context, errp) < 0) { return -1; } - if (nbd_receive_option_reply(ioc, NBD_OPT_SET_META_CONTEXT, &reply, - errp) < 0) - { + ret =3D nbd_receive_one_meta_context(ioc, NBD_OPT_SET_META_CONTEXT, + &name, &info->context_id, errp); + if (ret < 0) { return -1; } - - ret =3D nbd_handle_reply_err(ioc, &reply, errp); - if (ret <=3D 0) { - return ret; - } - - if (reply.type =3D=3D NBD_REP_META_CONTEXT) { - char *name; - - if (reply.length !=3D sizeof(info->context_id) + strlen(context)) { - error_setg(errp, "Failed to negotiate meta context '%s', serve= r " - "answered with unexpected length %" PRIu32, context, - reply.length); - nbd_send_opt_abort(ioc); - return -1; - } - - if (nbd_read(ioc, &info->context_id, sizeof(info->context_id), - errp) < 0) { - return -1; - } - info->context_id =3D be32_to_cpu(info->context_id); - - reply.length -=3D sizeof(info->context_id); - name =3D g_malloc(reply.length + 1); - if (nbd_read(ioc, name, reply.length, errp) < 0) { - g_free(name); - return -1; - } - name[reply.length] =3D '\0'; + if (ret =3D=3D 1) { if (strcmp(context, name)) { error_setg(errp, "Failed to negotiate meta context '%s', serve= r " "answered with different context '%s'", context, @@ -743,36 +793,19 @@ static int nbd_negotiate_simple_meta_context(QIOChann= el *ioc, return -1; } g_free(name); - - trace_nbd_opt_meta_reply(context, info->context_id); received =3D true; - /* receive NBD_REP_ACK */ - if (nbd_receive_option_reply(ioc, NBD_OPT_SET_META_CONTEXT, &reply, - errp) < 0) - { + ret =3D nbd_receive_one_meta_context(ioc, NBD_OPT_SET_META_CONTEXT, + NULL, NULL, errp); + if (ret < 0) { return -1; } - - ret =3D nbd_handle_reply_err(ioc, &reply, errp); - if (ret <=3D 0) { - return ret; - } } - - if (reply.type !=3D NBD_REP_ACK) { - error_setg(errp, "Unexpected reply type %u (%s), expected %u (%s)", - reply.type, nbd_rep_lookup(reply.type), - NBD_REP_ACK, nbd_rep_lookup(NBD_REP_ACK)); + if (ret !=3D 0) { + error_setg(errp, "Server answered with more than one context"); nbd_send_opt_abort(ioc); return -1; } - if (reply.length) { - error_setg(errp, "Unexpected length to ACK response"); - nbd_send_opt_abort(ioc); - return -1; - } - return received; } diff --git a/nbd/trace-events b/nbd/trace-events index 59521e47a3d..b4802c1570e 100644 --- a/nbd/trace-events +++ b/nbd/trace-events @@ -13,7 +13,7 @@ nbd_receive_query_exports_success(const char *wantname) "= Found desired export na nbd_receive_starttls_new_client(void) "Setting up TLS" nbd_receive_starttls_tls_handshake(void) "Starting TLS handshake" nbd_opt_meta_request(const char *optname, const char *context, const char = *export) "Requesting %s %s for export %s" -nbd_opt_meta_reply(const char *context, uint32_t id) "Received mapping of = context %s to id %" PRIu32 +nbd_opt_meta_reply(const char *optname, const char *context, uint32_t id) = "Received %s mapping of %s to id %" PRIu32 nbd_receive_negotiate(void *tlscreds, const char *hostname) "Receiving neg= otiation tlscreds=3D%p hostname=3D%s" nbd_receive_negotiate_magic(uint64_t magic) "Magic is 0x%" PRIx64 nbd_receive_negotiate_server_flags(uint32_t globalflags) "Global flags are= 0x%" PRIx32 --=20 2.20.1