From nobody Sun Oct 5 19:25:05 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1632780134396950.9759786436294; Mon, 27 Sep 2021 15:02:14 -0700 (PDT) Received: from localhost ([::1]:41522 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mUyhR-0004XI-AG for importer@patchew.org; Mon, 27 Sep 2021 18:02:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54686) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mUybo-0002nr-Tw for qemu-devel@nongnu.org; Mon, 27 Sep 2021 17:56:26 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:21670) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mUybl-00034A-Ic for qemu-devel@nongnu.org; Mon, 27 Sep 2021 17:56:24 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-406-AfMgT85BONWmoGEc5pJUUw-1; Mon, 27 Sep 2021 17:56:19 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 40D741006AA4; Mon, 27 Sep 2021 21:56:18 +0000 (UTC) Received: from blue.redhat.com (ovpn-113-87.phx2.redhat.com [10.3.113.87]) by smtp.corp.redhat.com (Postfix) with ESMTP id CA8295D9D5; Mon, 27 Sep 2021 21:56:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632779780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=i7cYrL1csZev2/4P5tAvdGKtIzV1H0EVC7XYk93Rlo0=; b=eyyYaguWCzP8QRXhEDXXZIks87AW9GnrDmWbdLeBXWyrg7rnXwGaXfOTkpDes+/ciQ1wSL PRK41Z40yjqzL5xTYEfU03dWrdsK1fgETNZ6FKjsnOrz4jS3ZPwrZ491GYgssKtQBx5Ih6 RmvtELPUc6nHgh3OWswLQ/VCx+oZu5o= X-MC-Unique: AfMgT85BONWmoGEc5pJUUw-1 From: Eric Blake To: qemu-devel@nongnu.org Subject: [PULL 19/20] block/nbd: check that received handle is valid Date: Mon, 27 Sep 2021 16:55:44 -0500 Message-Id: <20210927215545.3930309-20-eblake@redhat.com> In-Reply-To: <20210927215545.3930309-1-eblake@redhat.com> References: <20210927215545.3930309-1-eblake@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eblake@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=170.10.133.124; envelope-from=eblake@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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 , Hanna Reitz , Vladimir Sementsov-Ogievskiy , "open list:Network Block Dev..." Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1632780134957100003 Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy If we don't have active request, that waiting for this handle to be received, we should report an error. Signed-off-by: Vladimir Sementsov-Ogievskiy Message-Id: <20210902103805.25686-6-vsementsov@virtuozzo.com> Reviewed-by: Eric Blake Signed-off-by: Eric Blake --- block/nbd.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index 8ff6daf43d46..5ef462db1b7f 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -58,6 +58,7 @@ typedef struct { Coroutine *coroutine; uint64_t offset; /* original offset of the request */ bool receiving; /* sleeping in the yield in nbd_receive_replie= s */ + bool reply_possible; /* reply header not yet received */ } NBDClientRequest; typedef enum NBDClientState { @@ -415,14 +416,7 @@ static coroutine_fn int nbd_receive_replies(BDRVNBDSta= te *s, uint64_t handle) return 0; } ind2 =3D HANDLE_TO_INDEX(s, s->reply.handle); - if (ind2 >=3D MAX_NBD_REQUESTS || !s->requests[ind2].coroutine) { - /* - * We only check that ind2 request exists. But don't check - * whether it is now waiting for the reply header or - * not. We can't just check s->requests[ind2].receiving: - * ind2 request may wait in trying to lock - * receive_mutex. So that's a TODO. - */ + if (ind2 >=3D MAX_NBD_REQUESTS || !s->requests[ind2].reply_possibl= e) { nbd_channel_error(s, -EINVAL); return -EINVAL; } @@ -468,6 +462,7 @@ static int nbd_co_send_request(BlockDriverState *bs, s->requests[i].coroutine =3D qemu_coroutine_self(); s->requests[i].offset =3D request->from; s->requests[i].receiving =3D false; + s->requests[i].reply_possible =3D true; request->handle =3D INDEX_TO_HANDLE(s, i); --=20 2.31.1