From nobody Sat May 4 08:20:36 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1617200910; cv=none; d=zohomail.com; s=zohoarc; b=LC0a2MnG3pJ+Bfouzmm/g6DgW+kldnst4clrIL1JUgBCYYa9Bkn+sENvEPvdXbHiQY9V+lBobzkt2TPQlooc0/e6g0daOScRroUtZ+nw8vYRZv9YoumxAJKlCJjMVcizjq5vCF1sKcC7Lrpj4GYwm5VA6pNIcob5oisVpIbwzIk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617200910; h=Content-Type: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=qMdZN+A50oAa5Pg2GR3WaK2FI9glbASRQXnmOxDEiBA=; b=Fyj7xz/AQudi2n4PQ+YB4YmjdyhuUio4vufK5xpcEVPcY+gMiRGA/EmOSSwGZARYOZWet817AXxciMUy7AjMearM0D3lhzcAvjzniuz483sf8MOEUDfU2dMq6N0R3rUV4awqPCD+vrtUJR3ZC9RQBFdkhI6ySbPxfFIdywRSWIc= ARC-Authentication-Results: i=1; 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 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 1617200910276339.57583808999516; Wed, 31 Mar 2021 07:28:30 -0700 (PDT) Received: from localhost ([::1]:41406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRbpc-00076k-KS for importer@patchew.org; Wed, 31 Mar 2021 10:28:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33696) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRbor-0006bH-Lz for qemu-devel@nongnu.org; Wed, 31 Mar 2021 10:27:41 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:24438) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRbon-0005s4-Hw for qemu-devel@nongnu.org; Wed, 31 Mar 2021 10:27:40 -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-58-MXrbH_i-O6afERIB374osg-1; Wed, 31 Mar 2021 10:27:33 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6DCF280067; Wed, 31 Mar 2021 14:27:32 +0000 (UTC) Received: from localhost (ovpn-115-85.ams2.redhat.com [10.36.115.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id DD75019C44; Wed, 31 Mar 2021 14:27:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617200855; 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; bh=qMdZN+A50oAa5Pg2GR3WaK2FI9glbASRQXnmOxDEiBA=; b=Er5GvN9x/7mg2cUeD6X8k4mLhSSE6G8hgUsBWeDTWkNMCHxceJ7sL3AdOl4gtjDk57m2ye Cm4uAIRj10W4CCqFtkVLXLkO3g5o85DCcuysY1frReYQBrdyrNnzopL3A8Ysa6bfth2zwk ju0F40BlfpQZuq4KlOG9WWU6OESJrtA= X-MC-Unique: MXrbH_i-O6afERIB374osg-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH] block/export: improve vu_blk_sect_range_ok() Date: Wed, 31 Mar 2021 15:27:27 +0100 Message-Id: <20210331142727.391465-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@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=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 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, MIME_BASE64_TEXT=1.741, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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 , Stefan Hajnoczi , Coiby Xu , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The checks in vu_blk_sect_range_ok() assume VIRTIO_BLK_SECTOR_SIZE is equal to BDRV_SECTOR_SIZE. This is true, but let's add a QEMU_BUILD_BUG_ON() to make it explicit. We might as well check that the request buffer size is a multiple of VIRTIO_BLK_SECTOR_SIZE while we're at it. Suggested-by: Max Reitz Signed-off-by: Stefan Hajnoczi Reviewed-by: Eric Blake --- block/export/vhost-user-blk-server.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/block/export/vhost-user-blk-server.c b/block/export/vhost-user= -blk-server.c index fa06996d37..1862563336 100644 --- a/block/export/vhost-user-blk-server.c +++ b/block/export/vhost-user-blk-server.c @@ -70,9 +70,16 @@ static void vu_blk_req_complete(VuBlkReq *req) static bool vu_blk_sect_range_ok(VuBlkExport *vexp, uint64_t sector, size_t size) { - uint64_t nb_sectors =3D size >> BDRV_SECTOR_BITS; + uint64_t nb_sectors; uint64_t total_sectors; =20 + if (size % VIRTIO_BLK_SECTOR_SIZE) { + return false; + } + + nb_sectors =3D size >> VIRTIO_BLK_SECTOR_BITS; + + QEMU_BUILD_BUG_ON(BDRV_SECTOR_SIZE !=3D VIRTIO_BLK_SECTOR_SIZE); if (nb_sectors > BDRV_REQUEST_MAX_SECTORS) { return false; } --=20 2.30.2