From nobody Thu Nov 6 08:36:11 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1497525303793180.66299250601446; Thu, 15 Jun 2017 04:15:03 -0700 (PDT) Received: from localhost ([::1]:53229 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLSju-00042U-CJ for importer@patchew.org; Thu, 15 Jun 2017 07:15:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41192) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLSPP-0000D8-Mw for qemu-devel@nongnu.org; Thu, 15 Jun 2017 06:53:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dLSPL-0007hH-Lx for qemu-devel@nongnu.org; Thu, 15 Jun 2017 06:53:51 -0400 Received: from mail-wr0-x231.google.com ([2a00:1450:400c:c0c::231]:34308) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dLSPL-0007ge-FL for qemu-devel@nongnu.org; Thu, 15 Jun 2017 06:53:47 -0400 Received: by mail-wr0-x231.google.com with SMTP id 77so16401108wrb.1 for ; Thu, 15 Jun 2017 03:53:47 -0700 (PDT) Received: from 640k.lan (94-39-191-51.adsl-ull.clienti.tiscali.it. [94.39.191.51]) by smtp.gmail.com with ESMTPSA id f21sm3258597wra.5.2017.06.15.03.53.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Jun 2017 03:53:45 -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=ElkLerdwLbQAGvoGVolRFyLLb+SvyZ5n7Spp9SQz7gY=; b=kmWQrOSwCMjf59yLehqEetG7aU1DBi2pLY7ioXVQxWJhaDoLiuhWS4B/UzOE/qzxPV pmzKK65U3K7B9rBh1e2tI8hVlJis7HQMxHT7bpmeo2y85m7GFXEF9B7KqLzrKgDfOmne 9mfD38EsLJXZAjY/VSKS2wZSmNUhoTD1B1/CjDgf7036YfIs3/a+OjSeQ0wVgq1XnwZS WvvxCH/YKHNMs9rpmwNDmw6/Ug7XHRSo+wp7ennnP8UXinukKo8kYWGuZxCrxSD7mLpq CwDucxHJ+Tg1joJEZo3K6zwEVZIjqPkm2HA3Y3Rh44EbXUp+p/VZaiyD+TnHlvjOZ6rj XkgA== 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=ElkLerdwLbQAGvoGVolRFyLLb+SvyZ5n7Spp9SQz7gY=; b=Lp8rIKnxM/DEX3N93IcMF0SEe1+f09KCRpcCt6/45GVwPj7BHAJnW/YvlFIyQcxCbp 444TlOw1dqgyOzCCC66etdJw8XsbWzuazdPflbLfM04JukQdDI7vodP5Mv8wgjxIIY/f l99vtL6LsXPuKWk9uEau5J0ZHcjHA1J5tNY60YFOjyRB9R8gOArXK2W6bnwKBizr1XrJ 7brwWwIQjrMDQ+3D8sNkXzKmJ0twTFzGArMapjHglosESprLzbjfMNK/JLxEHvQA0a9C tKgCWrn7SwQAf6vnBajyAvVAFHX1qwKSl1G3oeYpDyoO9LhRirgQqOVgZXZqFsAOesgl smbQ== X-Gm-Message-State: AKS2vOzooqvjfz5HshSxjiibMaN8Y2ZM5svwBhsPlgnqpnP3gGClxsDs x5PNJrjyMV4TSMhE55Y= X-Received: by 10.28.191.29 with SMTP id p29mr2996437wmf.60.1497524026149; Thu, 15 Jun 2017 03:53:46 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 15 Jun 2017 12:52:52 +0200 Message-Id: <1497523981-38449-33-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1497523981-38449-1-git-send-email-pbonzini@redhat.com> References: <1497523981-38449-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::231 Subject: [Qemu-devel] [PULL 32/41] nbd/server: nbd_negotiate: fix error path 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 Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Current code will return 0 on this nbd_write fail, as rc is 0 after successful nbd_negotiate_options. Fix this. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake Message-Id: <20170602150150.258222-10-vsementsov@virtuozzo.com> Signed-off-by: Paolo Bonzini --- nbd/server.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nbd/server.c b/nbd/server.c index d526827..c9ca847 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -607,7 +607,8 @@ static coroutine_fn int nbd_negotiate(NBDClient *client) stq_be_p(buf + 18, client->exp->size); stw_be_p(buf + 26, client->exp->nbdflags | myflags); len =3D client->no_zeroes ? 10 : sizeof(buf) - 18; - if (nbd_write(client->ioc, buf + 18, len, NULL) < 0) { + rc =3D nbd_write(client->ioc, buf + 18, len, NULL); + if (rc < 0) { LOG("write failed"); goto fail; } --=20 1.8.3.1