From patchwork Tue Jun 19 01:42:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 931283 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.vnet.ibm.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="a/rHP47k"; dkim-atps=neutral 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 418sJh3cxyz9s37 for ; Tue, 19 Jun 2018 12:25:56 +1000 (AEST) Received: from localhost ([::1]:38611 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fV6LC-00071H-3J for incoming@patchwork.ozlabs.org; Mon, 18 Jun 2018 22:25:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46580) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fV5ix-0002ZY-Q9 for qemu-devel@nongnu.org; Mon, 18 Jun 2018 21:46:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fV5iw-0000Lx-SJ for qemu-devel@nongnu.org; Mon, 18 Jun 2018 21:46:23 -0400 Received: from mail-ot0-x230.google.com ([2607:f8b0:4003:c0f::230]:32872) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fV5iw-0000Lp-N5; Mon, 18 Jun 2018 21:46:22 -0400 Received: by mail-ot0-x230.google.com with SMTP id h6-v6so20792322otj.0; Mon, 18 Jun 2018 18:46:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=oy25+ZaVV7xsey0Sb3QeP29b1RUA74k4kYyQKvloSu0=; b=a/rHP47kF1X4QX0kBnZ8b9b1CR/9IAQOYUsLpRpZFnM45qbc9S2VJK5XdmofidwBBI 8zcvn/DokgXAqBmGRYY2Rw2z9fna9u1Q5p7MBJIbxu53hh8GqP5IKsgdyqMmCENdSenv OV39LCdisr//y0gJY8lhhf+VstVtxExOwsjZIWxRgD8Arzw/LxfXcQH93MrA7C5EjFre x0rE5ZfnrBb2OjIvR7mG4DD1Z/fmtfuhoxJQYSxzLfJXYNqDV+kR7RwNdGUoXFwohRuf 6i7ksHBjNYMQn/RVO+3xBjZ/MVTQibRgq2I/VmLJw7mgj1A6C7GFjiWUdiJk5ZfZu1Ba +Icg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=oy25+ZaVV7xsey0Sb3QeP29b1RUA74k4kYyQKvloSu0=; b=ELg3EZKdrgc1XbTmudxJCjJZouF4lhrQP6epBaAhmccez4k99Z4vG4B+xQcgL6pvh0 AgDd8aj8ry5eOZnhuRugOie3Y+pTKNbM464zcKR4GgX/EYI+c358dsVmyPI4eDWueitO H7BPxKx2guoPcmdQ0aNCvJ5r3OqBXoaYbpWYDknjVgyVdyU+B/2mvz+qdqhXHwEWddeo ji/Qlwt1kv7CFGsruboy5oSzVFxQLTmH9FIgaXd96wpmZfWrRxkQj8lc/D6FcVeMYZ4P VtBnU7hGjsUv5dXpyvkx0fUdX9J1a6DtcuxzTjjXFRcviydtS6+noKUKgwz0JdpmiIFO M3yA== X-Gm-Message-State: APt69E3hFh84kESLgvew/E9/FaxX1nb9/3/uJ+VpvA7gj7wCAjIm+xsl 0fibhGoxATEOvfksmOZeTrJeJ4SbEdo= X-Google-Smtp-Source: ADUXVKJuKm693ZLMmARVoXVD4zYnHpuy6CpR250OjIWA3C+KD80wrIkqY0IwWsSVYcgKJf0FDeooOA== X-Received: by 2002:a9d:272c:: with SMTP id r41-v6mr9810900ota.46.1529372781542; Mon, 18 Jun 2018 18:46:21 -0700 (PDT) Received: from localhost ([2600:1700:70:e488:b0ee:9bda:ee6f:91be]) by smtp.gmail.com with ESMTPSA id b12-v6sm6813055oiy.43.2018.06.18.18.46.20 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Jun 2018 18:46:20 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Mon, 18 Jun 2018 20:42:27 -0500 Message-Id: <20180619014319.28272-62-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180619014319.28272-1-mdroth@linux.vnet.ibm.com> References: <20180619014319.28272-1-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4003:c0f::230 Subject: [Qemu-devel] [PATCH 061/113] nbd/client: Fix error messages during NBD_INFO_BLOCK_SIZE 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: qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Eric Blake A missing space makes for poor error messages, and sizes can't go negative. Also, we missed diagnosing a server that sends a maximum block size less than the minimum. Fixes: 081dd1fe CC: qemu-stable@nongnu.org Signed-off-by: Eric Blake Message-Id: <20180501154654.943782-1-eblake@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy (cherry picked from commit e475d108f1b3d3163f0affea67cdedbe5fc9752b) Signed-off-by: Michael Roth --- nbd/client.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/nbd/client.c b/nbd/client.c index eea236ca06..0906d7b2c5 100644 --- a/nbd/client.c +++ b/nbd/client.c @@ -435,8 +435,8 @@ static int nbd_opt_go(QIOChannel *ioc, const char *wantname, } be32_to_cpus(&info->min_block); if (!is_power_of_2(info->min_block)) { - error_setg(errp, "server minimum block size %" PRId32 - "is not a power of two", info->min_block); + error_setg(errp, "server minimum block size %" PRIu32 + " is not a power of two", info->min_block); nbd_send_opt_abort(ioc); return -1; } @@ -450,8 +450,8 @@ static int nbd_opt_go(QIOChannel *ioc, const char *wantname, be32_to_cpus(&info->opt_block); if (!is_power_of_2(info->opt_block) || info->opt_block < info->min_block) { - error_setg(errp, "server preferred block size %" PRId32 - "is not valid", info->opt_block); + error_setg(errp, "server preferred block size %" PRIu32 + " is not valid", info->opt_block); nbd_send_opt_abort(ioc); return -1; } @@ -462,6 +462,12 @@ static int nbd_opt_go(QIOChannel *ioc, const char *wantname, return -1; } be32_to_cpus(&info->max_block); + if (info->max_block < info->min_block) { + error_setg(errp, "server maximum block size %" PRIu32 + " is not valid", info->max_block); + nbd_send_opt_abort(ioc); + return -1; + } trace_nbd_opt_go_info_block_size(info->min_block, info->opt_block, info->max_block); break;