From nobody Tue Nov 18 04:26:59 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 ARC-Seal: i=1; a=rsa-sha256; t=1607365617; cv=none; d=zohomail.com; s=zohoarc; b=DptyEs5H2AxWJQH0QQXnIcUxOjx0CM5VDgj1IKLcVPre6VMHHTs9sECLKw352B8LcS52skku4kDNac6g0n24xglWxN1UWqOfAHwTjbAmChwWsKKaZk4llVgd4LzP+D8c8DRyX3U9zGxiNkuQoJdNrNTLub6dDAApG+xLts1j6HE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607365617; h=Content-Type: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=brdJqXUv8yd/aZvFP8DTs5hYQMZjkSacTtDHmtnq2AY=; b=bpHMRfZT2QkSRP+kiZtUZPaHyVmvqX01mdMlf5qrWVg4iM1ZtG9zr3prnoF8UdVFz/L48SLlVnpqQrgPLh1VRRp/dGagRqWHi/haUKO2MiLc4qdjaQ2/V0kjgm3dGfSXq1o4bXGRZELhcPfb/7aacZMNZkQqAdvqE79kngXFKf0= 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 1607365617061280.4833993821345; Mon, 7 Dec 2020 10:26:57 -0800 (PST) Received: from localhost ([::1]:33590 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kmKId-0002lt-QD for importer@patchew.org; Mon, 07 Dec 2020 12:27:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46460) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmKFf-0000O5-5e for qemu-devel@nongnu.org; Mon, 07 Dec 2020 12:24:43 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:34620) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kmKFd-0006uE-CU for qemu-devel@nongnu.org; Mon, 07 Dec 2020 12:24:42 -0500 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-360-5rMxIoFqP56QTNKTkfNb5Q-1; Mon, 07 Dec 2020 12:24:37 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C62F8107ACE6; Mon, 7 Dec 2020 17:24:35 +0000 (UTC) Received: from localhost (ovpn-114-128.ams2.redhat.com [10.36.114.128]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4790760BE2; Mon, 7 Dec 2020 17:24:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607361880; 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=brdJqXUv8yd/aZvFP8DTs5hYQMZjkSacTtDHmtnq2AY=; b=ExC4FTnPOqxeHWA8T+zRoVX4WpRlqv6YDm57Ci+QjLW+uxVM2Grj+dMEFzYt5ktzrlrH3a b2t9FIeAfX5W/2TdgOD/4Hbu+eewMnJEI5x5Hd+iaazux40iylHNvNSlnS2epwyHZT5aJP aSQ/g/RID447KMwMnvz878fl7EuHYg0= X-MC-Unique: 5rMxIoFqP56QTNKTkfNb5Q-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH v2 12/12] block/export: port virtio-blk read/write range check Date: Mon, 7 Dec 2020 17:20:30 +0000 Message-Id: <20201207172030.251905-13-stefanha@redhat.com> In-Reply-To: <20201207172030.251905-1-stefanha@redhat.com> References: <20201207172030.251905-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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=63.128.21.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 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_NONE=-0.0001, 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: Laurent Vivier , Kevin Wolf , Thomas Huth , qemu-block@nongnu.org, Peter Maydell , "Michael S . Tsirkin" , Coiby Xu , Max Reitz , Stefan Hajnoczi , Paolo Bonzini , Raphael Norwitz 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" Check that the sector number and byte count are valid. Signed-off-by: Stefan Hajnoczi --- block/export/vhost-user-blk-server.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/block/export/vhost-user-blk-server.c b/block/export/vhost-user= -blk-server.c index 937bb5e9b4..dbe3cfb9e8 100644 --- a/block/export/vhost-user-blk-server.c +++ b/block/export/vhost-user-blk-server.c @@ -209,6 +209,8 @@ static void coroutine_fn vu_blk_virtio_process_req(void= *opaque) switch (type & ~VIRTIO_BLK_T_BARRIER) { case VIRTIO_BLK_T_IN: case VIRTIO_BLK_T_OUT: { + QEMUIOVector qiov; + int64_t offset; ssize_t ret =3D 0; bool is_write =3D type & VIRTIO_BLK_T_OUT; req->sector_num =3D le64_to_cpu(req->out.sector); @@ -218,13 +220,24 @@ static void coroutine_fn vu_blk_virtio_process_req(vo= id *opaque) break; } =20 - int64_t offset =3D req->sector_num << VIRTIO_BLK_SECTOR_BITS; - QEMUIOVector qiov; if (is_write) { qemu_iovec_init_external(&qiov, out_iov, out_num); - ret =3D blk_co_pwritev(blk, offset, qiov.size, &qiov, 0); } else { qemu_iovec_init_external(&qiov, in_iov, in_num); + } + + if (unlikely(!vu_blk_sect_range_ok(vexp, + req->sector_num, + qiov.size))) { + req->in->status =3D VIRTIO_BLK_S_IOERR; + break; + } + + offset =3D req->sector_num << VIRTIO_BLK_SECTOR_BITS; + + if (is_write) { + ret =3D blk_co_pwritev(blk, offset, qiov.size, &qiov, 0); + } else { ret =3D blk_co_preadv(blk, offset, qiov.size, &qiov, 0); } if (ret >=3D 0) { --=20 2.28.0