From nobody Sun May 5 12:12:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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 (zohomail.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=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1577348187; cv=none; d=zohomail.com; s=zohoarc; b=SJGQyb8qt6+1PLytIK6z16YgFSfPpe1AVrO943IA2RCJdXAcagH6kLTvA2IwJ58gVBRDJ7IGPovDgoVd6eAWoBTxWd9mD21YXVr/tk4YKTdjQqyKkizp5POAYv7FCeYAJxYEIhw9IDf08GuZCOpU7SPbfWzq96h0Bvxjvz1n79I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1577348187; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=ANBlyvY7yZr7+jtH0ol38OERTwWXdyL4mYOb73GK2rw=; b=MpP5VxiJyD0b0ujajp2ApbSrF5tnqP+607Lg6By1zWZQxZ3L+Tcg1yOn/ushsBU8ew0189ZX1YiDNinwsMcrSlf2i6u8lYG9RcH+QFX8Fovi8uMG31IgDYspb+Mu4VZUZSQG3QSdH42vnU0sO9E3KZfXarFJODQzg2pyJ6eiZsw= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1577348187139205.0830054483855; Thu, 26 Dec 2019 00:16:27 -0800 (PST) Received: from localhost ([::1]:51960 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ikOJi-0002J9-P1 for importer@patchew.org; Thu, 26 Dec 2019 03:16:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39080) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ikOIv-0001k0-4G for qemu-devel@nongnu.org; Thu, 26 Dec 2019 03:15:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ikOIu-0001kC-2j for qemu-devel@nongnu.org; Thu, 26 Dec 2019 03:15:33 -0500 Received: from relay.sw.ru ([185.231.240.75]:33626) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ikOIr-0001ho-Cc; Thu, 26 Dec 2019 03:15:29 -0500 Received: from vovaso.qa.sw.ru ([10.94.3.0] helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.3) (envelope-from ) id 1ikOIk-0000kR-2r; Thu, 26 Dec 2019 11:15:22 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH] nbd/server: improve nbd_negotiate_send_rep_list Date: Thu, 26 Dec 2019 11:15:21 +0300 Message-Id: <20191226081521.29652-1-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: vsementsov@virtuozzo.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Don't try to write zero-lenght strings. Signed-off-by: Vladimir Sementsov-Ogievskiy --- nbd/server.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/nbd/server.c b/nbd/server.c index 24ebc1a805..28a915f5a2 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -392,14 +392,18 @@ static int nbd_negotiate_send_rep_list(NBDClient *cli= ent, NBDExport *exp, return -EINVAL; } =20 - if (nbd_write(ioc, name, name_len, errp) < 0) { - error_prepend(errp, "write failed (name buffer): "); - return -EINVAL; + if (name_len > 0) { + if (nbd_write(ioc, name, name_len, errp) < 0) { + error_prepend(errp, "write failed (name buffer): "); + return -EINVAL; + } } =20 - if (nbd_write(ioc, desc, desc_len, errp) < 0) { - error_prepend(errp, "write failed (description buffer): "); - return -EINVAL; + if (desc_len > 0) { + if (nbd_write(ioc, desc, desc_len, errp) < 0) { + error_prepend(errp, "write failed (description buffer): "); + return -EINVAL; + } } =20 return 0; --=20 2.21.0