From nobody Thu Nov 13 02:01:47 2025 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=1575568279; cv=none; d=zohomail.com; s=zohoarc; b=VOUcgsrLYz94WC/SSmO2trXq8zuDiDZsaOL0T5+Q5oBMpuI5ShjXPXNMOcHZfyTGCiKZAEBFeOU/yEPxMfl0ku7F9AhMEXXF4lCkuNqoCuTebQqnmydi7qeQIv+lFnqWYLEKotjUEoquYdA1qpRN8p0QqN4EggUfyYZq42q8FpY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575568279; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qwbSjS1IYR1tCPozhl7o6alA1U5C1yUE6JEPK91yB9k=; b=a9lgdvWQ3hy5D5rnACipotowH0JmADdKx3eIdYI2sBtixvSZYLGNTOwVP4mCLC9CSHEI53HWnXASuFgxbXHmVLgMYq1cpsJCHM3Tr6H5J/MoL8lUGuGeMSonuyhvfMNQ3zY6HvQEle0gRVA+lcz3waN7lABI8yUgU3T7o6IPi14= 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 1575568279368195.9102095917973; Thu, 5 Dec 2019 09:51:19 -0800 (PST) Received: from localhost ([::1]:58798 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icvHZ-0002mZ-VZ for importer@patchew.org; Thu, 05 Dec 2019 12:51:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45254) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icvDI-0007c4-G1 for qemu-devel@nongnu.org; Thu, 05 Dec 2019 12:46:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1icvDG-0003ay-74 for qemu-devel@nongnu.org; Thu, 05 Dec 2019 12:46:52 -0500 Received: from relay.sw.ru ([185.231.240.75]:48298) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1icvDE-0003Sd-4l; Thu, 05 Dec 2019 12:46:48 -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 1icvD9-00013M-6O; Thu, 05 Dec 2019 20:46:43 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [PATCH v8 21/21] nbd: assert that Error** is not NULL in nbd_iter_channel_error Date: Thu, 5 Dec 2019 20:46:35 +0300 Message-Id: <20191205174635.18758-22-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191205174635.18758-1-vsementsov@virtuozzo.com> References: <20191205174635.18758-1-vsementsov@virtuozzo.com> 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: Kevin Wolf , vsementsov@virtuozzo.com, qemu-block@nongnu.org, armbru@redhat.com, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The local_err parameter is not here to return information about nbd_iter_channel_error failure. Instead it's assumed to be filled when passed to the function. This is already stressed by its name (local_err, instead of classic errp). Stress it additionally by assertion. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/nbd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/block/nbd.c b/block/nbd.c index 5f18f78a94..d085554f21 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -866,6 +866,7 @@ typedef struct NBDReplyChunkIter { static void nbd_iter_channel_error(NBDReplyChunkIter *iter, int ret, Error **local_err) { + assert(local_err && *local_err); assert(ret < 0); =20 if (!iter->ret) { --=20 2.21.0