From nobody Sat Oct 4 17:29:38 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=1601988224; cv=none; d=zohomail.com; s=zohoarc; b=a/Fb+6AqARCyrFkanQQtGBvDCyW+gut9DTEy7QbtsWBXY70RAFQeopoEVRNjYVKjj6svSfhQFYCSz2sMCVJMk0BTMMDo07gPdw7lAluegW7JfXfE5++7MYLhd9osvONAaRVBKBtIMfPYoNJVXkjySviGIMSSC+nxxaQYw+C7JGE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601988224; 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=shOIJYgxYzcmRivCljSya+L2pr1469DS4r2QiFZqyvs=; b=iYZIedCbF4LfEz3Ykk9rXlh2K5pP/Ugjve6cY9tJXAi+AmwdGjAbIbnPAjg6Rl9B7GExplmACHARqLUABtorzGUzUUIRT21jr21HoRDK2hKKV4t6A4XDH/kqFZY7v1fJQwprbobBL/qWBas00J1iORvVgn3avrx24Qdv48w3UVM= 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 16019882245311008.1786469758614; Tue, 6 Oct 2020 05:43:44 -0700 (PDT) Received: from localhost ([::1]:53582 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPmJj-0005IW-6L for importer@patchew.org; Tue, 06 Oct 2020 08:43:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56424) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPmGn-0002Md-PI for qemu-devel@nongnu.org; Tue, 06 Oct 2020 08:40:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:34539) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kPmGl-00081V-E8 for qemu-devel@nongnu.org; Tue, 06 Oct 2020 08:40:41 -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-221-diVoSdJTMwGBjJdL6dTnOw-1; Tue, 06 Oct 2020 08:40:33 -0400 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 C6AD356B2B; Tue, 6 Oct 2020 12:40:31 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.206.84]) by smtp.corp.redhat.com (Postfix) with ESMTP id DA6C055760; Tue, 6 Oct 2020 12:40:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601988036; 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=shOIJYgxYzcmRivCljSya+L2pr1469DS4r2QiFZqyvs=; b=cDhs/0ksxit/421/OfNUxsY6zcXd0+w9tVf9Us6CexjwXeHK4mSXF4JxCT4YHe7WX5BUSc yquT4/lfa+4nXJ7IbuUUIoIXIm3Aj2/Q+hw9Jn3D1Rt5kNb3OXxyPuubh+JLbC5iiEpUmx P7IqF1751Eie7qJ0UgzdCNtZI04m/W4= X-MC-Unique: diVoSdJTMwGBjJdL6dTnOw-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH v7 13/13] scsi/scsi_bus: fix races in REPORT LUNS Date: Tue, 6 Oct 2020 15:39:04 +0300 Message-Id: <20201006123904.610658-14-mlevitsk@redhat.com> In-Reply-To: <20201006123904.610658-1-mlevitsk@redhat.com> References: <20201006123904.610658-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/10/06 00:55:20 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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.733, 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=ham 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 , Laurent Vivier , Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , qemu-block@nongnu.org, "Michael S. Tsirkin" , Jason Wang , Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Paolo Bonzini , Maxim Levitsky , John Snow , Stefan Berger 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" Currently scsi_target_emulate_report_luns iterates over the child device li= st twice, and there is no guarantee that this list is the same in both iterati= ons. The reason for iterating twice is that the first iteration calculates how much memory to allocate. However if we use a dynamic array we can avoid iterating twice, and therefore we avoid this race. Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=3D1866707 Signed-off-by: Maxim Levitsky Reviewed-by: Stefan Hajnoczi Message-Id: <20200913160259.32145-10-mlevitsk@redhat.com> Signed-off-by: Paolo Bonzini --- hw/scsi/scsi-bus.c | 68 ++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 35 deletions(-) diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index eda8cb7e70..b901e701f0 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -438,19 +438,23 @@ struct SCSITargetReq { static void store_lun(uint8_t *outbuf, int lun) { if (lun < 256) { + /* Simple logical unit addressing method*/ + outbuf[0] =3D 0; outbuf[1] =3D lun; - return; + } else { + /* Flat space addressing method */ + outbuf[0] =3D 0x40 | (lun >> 8); + outbuf[1] =3D (lun & 255); } - outbuf[1] =3D (lun & 255); - outbuf[0] =3D (lun >> 8) | 0x40; } =20 static bool scsi_target_emulate_report_luns(SCSITargetReq *r) { BusChild *kid; - int i, len, n; int channel, id; - bool found_lun0; + uint8_t tmp[8] =3D {0}; + int len =3D 0; + GByteArray *buf; =20 if (r->req.cmd.xfer < 16) { return false; @@ -458,46 +462,40 @@ static bool scsi_target_emulate_report_luns(SCSITarge= tReq *r) if (r->req.cmd.buf[2] > 2) { return false; } + + /* reserve space for 63 LUNs*/ + buf =3D g_byte_array_sized_new(512); + channel =3D r->req.dev->channel; id =3D r->req.dev->id; - found_lun0 =3D false; - n =3D 0; =20 - RCU_READ_LOCK_GUARD(); + /* add size (will be updated later to correct value */ + g_byte_array_append(buf, tmp, 8); + len +=3D 8; =20 - QTAILQ_FOREACH_RCU(kid, &r->req.bus->qbus.children, sibling) { - DeviceState *qdev =3D kid->child; - SCSIDevice *dev =3D SCSI_DEVICE(qdev); + /* add LUN0 */ + g_byte_array_append(buf, tmp, 8); + len +=3D 8; =20 - if (dev->channel =3D=3D channel && dev->id =3D=3D id) { - if (dev->lun =3D=3D 0) { - found_lun0 =3D true; + WITH_RCU_READ_LOCK_GUARD() { + QTAILQ_FOREACH_RCU(kid, &r->req.bus->qbus.children, sibling) { + DeviceState *qdev =3D kid->child; + SCSIDevice *dev =3D SCSI_DEVICE(qdev); + + if (dev->channel =3D=3D channel && dev->id =3D=3D id && dev->l= un !=3D 0) { + store_lun(tmp, dev->lun); + g_byte_array_append(buf, tmp, 8); + len +=3D 8; } - n +=3D 8; } } - if (!found_lun0) { - n +=3D 8; - } - - scsi_target_alloc_buf(&r->req, n + 8); - - len =3D MIN(n + 8, r->req.cmd.xfer & ~7); - memset(r->buf, 0, len); - stl_be_p(&r->buf[0], n); - i =3D found_lun0 ? 8 : 16; - QTAILQ_FOREACH_RCU(kid, &r->req.bus->qbus.children, sibling) { - DeviceState *qdev =3D kid->child; - SCSIDevice *dev =3D SCSI_DEVICE(qdev); =20 - if (dev->channel =3D=3D channel && dev->id =3D=3D id) { - store_lun(&r->buf[i], dev->lun); - i +=3D 8; - } - } + r->buf_len =3D len; + r->buf =3D g_byte_array_free(buf, FALSE); + r->len =3D MIN(len, r->req.cmd.xfer & ~7); =20 - assert(i =3D=3D n + 8); - r->len =3D len; + /* store the LUN list length */ + stl_be_p(&r->buf[0], len - 8); return true; } =20 --=20 2.26.2