From nobody Mon Feb 9 06:49:13 2026 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=1604511578; cv=none; d=zohomail.com; s=zohoarc; b=gFwl4U+TJSXCY8VYIEdZ5XMRnXM3UGi6A/6Fj/WSy6nqrt+r6EqwoNIzEmN+qW74NW29Wh8aIzzgxS4Dz3VWKMUpTJfkhR4RQVvLGsMyMseTzKALhVjWyDPflgdNPyGnqIcdEWmeRioG/Xxu4xR0j9yh2DzdocBr1WdjH2E9P2U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604511578; 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=RQ52DGXPQuvl7eCGJZ9UeFOScVLeQApfOO2+jytMN1A=; b=TGJoS8273mi/fPfJhN4X2L++kYIArpx9H8XFwk+2cJe1y4Dnaf7GgC+Cjkbm5OfzZrqf1Jxsih9yjylSDRDiU4Zmd/3za89l/6wc78ztwRDXxjHcxCVdzvpg56HzaY/e82708VHwubeO7crEowrZMZ3bLl8WSCcB77nsOCRqEHg= 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 1604511578736540.3564097555035; Wed, 4 Nov 2020 09:39:38 -0800 (PST) Received: from localhost ([::1]:59754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaMkz-0001g2-GY for importer@patchew.org; Wed, 04 Nov 2020 12:39:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34598) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaMei-0003IO-BH for qemu-devel@nongnu.org; Wed, 04 Nov 2020 12:33:08 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:23959) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kaMeg-0000gf-PB for qemu-devel@nongnu.org; Wed, 04 Nov 2020 12:33:08 -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-27-p6120quWMvCRAdaseI_U9g-1; Wed, 04 Nov 2020 12:33:02 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4165EC7437; Wed, 4 Nov 2020 17:33:01 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.207.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3120875127; Wed, 4 Nov 2020 17:32:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604511186; 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=RQ52DGXPQuvl7eCGJZ9UeFOScVLeQApfOO2+jytMN1A=; b=UmjaPKTPU0nVYQnai1+KMveEr5bai9ULtAIQmJJZAVTxU43wDajM+Nt9UR90gEAf87+mRC gdrHAHtxincOI7TB3eqSugL1+v9qGrkY0VLuc1PphvDZ/R4m109gbk/4hRX9Ceu5jmve5q kK0Ml2C/eIRtUWMvQ9FkNZwaWdr8jJA= X-MC-Unique: p6120quWMvCRAdaseI_U9g-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH 5/5] block/scsi: correctly emulate the VPD block limits page Date: Wed, 4 Nov 2020 19:32:17 +0200 Message-Id: <20201104173217.417538-6-mlevitsk@redhat.com> In-Reply-To: <20201104173217.417538-1-mlevitsk@redhat.com> References: <20201104173217.417538-1-mlevitsk@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mlevitsk@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=216.205.24.124; envelope-from=mlevitsk@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/03 00:03:41 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.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, 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: Fam Zheng , Kevin Wolf , Stefan Hajnoczi , qemu-block@nongnu.org, Peter Lieven , Tom Yan , Ronnie Sahlberg , Paolo Bonzini , Maxim Levitsky , 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" When the device doesn't support the VPD block limits page, we emulate it ev= en for SCSI passthrough. As a part of the emulation we need to add it to the 'Supported VPD Pages' The code that does this adds it to the page, but it doesn't increase the le= ngth of the data to be copied to the guest, thus the guest never sees the VPD bl= ock limits page as supported. Bump the transfer size by 1 in this case. I also refactored the code a bit, and I hopefully didn't introduce another buffer overflow to this code... Signed-off-by: Maxim Levitsky --- hw/scsi/scsi-generic.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c index 6df67bf889..387d885aee 100644 --- a/hw/scsi/scsi-generic.c +++ b/hw/scsi/scsi-generic.c @@ -134,9 +134,9 @@ static int execute_command(BlockBackend *blk, return 0; } =20 -static void scsi_handle_inquiry_reply(SCSIGenericReq *r, SCSIDevice *s) +static int scsi_handle_inquiry_reply(SCSIGenericReq *r, SCSIDevice *s, int= len) { - uint8_t page, page_idx; + uint8_t page; =20 /* * EVPD set to zero returns the standard INQUIRY data. @@ -188,20 +188,26 @@ static void scsi_handle_inquiry_reply(SCSIGenericReq = *r, SCSIDevice *s) * right place with an in-place insert. When the while loop * begins the device response is at r[0] to r[page_idx - 1]. */ - page_idx =3D lduw_be_p(r->buf + 2) + 4; - page_idx =3D MIN(page_idx, r->buflen); + uint16_t page_len =3D lduw_be_p(r->buf + 2) + 4; + + /* pointer to first byte after the page that device gave us */ + uint16_t page_idx =3D page_len; + + if (page_idx >=3D r->buflen) + return len; + while (page_idx > 4 && r->buf[page_idx - 1] >=3D 0xb0) { - if (page_idx < r->buflen) { - r->buf[page_idx] =3D r->buf[page_idx - 1]; - } + r->buf[page_idx] =3D r->buf[page_idx - 1]; page_idx--; } - if (page_idx < r->buflen) { - r->buf[page_idx] =3D 0xb0; - } + r->buf[page_idx] =3D 0xb0; + + /* increase the page len field */ stw_be_p(r->buf + 2, lduw_be_p(r->buf + 2) + 1); + len++; } } + return len; } =20 static int scsi_generic_emulate_block_limits(SCSIGenericReq *r, SCSIDevice= *s) @@ -316,7 +322,7 @@ static void scsi_read_complete(void * opaque, int ret) } } if (r->req.cmd.buf[0] =3D=3D INQUIRY) { - scsi_handle_inquiry_reply(r, s); + len =3D scsi_handle_inquiry_reply(r, s, len); } =20 req_complete: --=20 2.26.2