From nobody Fri May 17 10:13:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1629288668; cv=none; d=zohomail.com; s=zohoarc; b=U1UjLMoj+sz1AP9vv5wJFpW+KEVA/BmBO0lApAMs8J960oPAhkW8IyFWP05HllNMcHOQaq/UnXBJyGFicX6VbUu1nVnQ3BQ5EZ6ARMnYe/KyDsfzIY9K038j5SO5oVAJ2HSNty2oUDpaB1q3Z67ueMfcB1CrJThku4nyHPz+HDM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629288668; 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=dv5NwYLoshj7diUrcyg+aw8Nq96H8hRPJFOOeziOKuY=; b=Z8dqnzLX8kK1q3g0fa29c9d3uO6DfIWvnH5HUh2BPPDbwcP0uvumH/8m16K6yw0v/zAnxoeCGawgDeB2qGHYoOJcz6ewq4CWmVmTApZ6qYZ4mHfCrvkj4ZNFgv3xjWT+tugUq/BqcNO04SUFEg7fdMh9DfDfQY1jfpkBd0hReEE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1629288668833563.2427432559721; Wed, 18 Aug 2021 05:11:08 -0700 (PDT) Received: from localhost ([::1]:41036 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mGKPT-0008Em-Kq for importer@patchew.org; Wed, 18 Aug 2021 08:11:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39738) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mGKJp-0003Po-2x for qemu-devel@nongnu.org; Wed, 18 Aug 2021 08:05:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:59916) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mGKJm-00009b-LB for qemu-devel@nongnu.org; Wed, 18 Aug 2021 08:05:16 -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-429-2KDh29XONHWJOInMqNVvIQ-1; Wed, 18 Aug 2021 08:05:11 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E66E61082921 for ; Wed, 18 Aug 2021 12:05:10 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.193.216]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D64F068D97; Wed, 18 Aug 2021 12:05:06 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 61B1A1800929; Wed, 18 Aug 2021 14:05:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629288313; 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=dv5NwYLoshj7diUrcyg+aw8Nq96H8hRPJFOOeziOKuY=; b=in6ycX6I+WhtPhQiWL59fQjrJxCxuvI8qmRO2kNEY8WP3OipuI3SkWGkUlIsUKjLO2jukj bvP38eestetNiMKYDGfzMutMlBnj9NqO4DnHZVCXkYlkbzr7TXSeNfBHKl46Ex0BPsTlmw ogK+TJzj4ir6qIdwq7TjTNkDqLtoK80= X-MC-Unique: 2KDh29XONHWJOInMqNVvIQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 1/1] uas: add stream number sanity checks. Date: Wed, 18 Aug 2021 14:05:05 +0200 Message-Id: <20210818120505.1258262-2-kraxel@redhat.com> In-Reply-To: <20210818120505.1258262-1-kraxel@redhat.com> References: <20210818120505.1258262-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@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=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, 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=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: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629288669964100001 Content-Type: text/plain; charset="utf-8" The device uses the guest-supplied stream number unchecked, which can lead to guest-triggered out-of-band access to the UASDevice->data3 and UASDevice->status3 fields. Add the missing checks. Fixes: CVE-2021-3713 Signed-off-by: Gerd Hoffmann Reported-by: Chen Zhe Reported-by: Tan Jingguo Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/usb/dev-uas.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c index 263056231c79..f6309a5ebfdc 100644 --- a/hw/usb/dev-uas.c +++ b/hw/usb/dev-uas.c @@ -840,6 +840,9 @@ static void usb_uas_handle_data(USBDevice *dev, USBPack= et *p) } break; case UAS_PIPE_ID_STATUS: + if (p->stream > UAS_MAX_STREAMS) { + goto err_stream; + } if (p->stream) { QTAILQ_FOREACH(st, &uas->results, next) { if (st->stream =3D=3D p->stream) { @@ -867,6 +870,9 @@ static void usb_uas_handle_data(USBDevice *dev, USBPack= et *p) break; case UAS_PIPE_ID_DATA_IN: case UAS_PIPE_ID_DATA_OUT: + if (p->stream > UAS_MAX_STREAMS) { + goto err_stream; + } if (p->stream) { req =3D usb_uas_find_request(uas, p->stream); } else { @@ -902,6 +908,11 @@ static void usb_uas_handle_data(USBDevice *dev, USBPac= ket *p) p->status =3D USB_RET_STALL; break; } + +err_stream: + error_report("%s: invalid stream %d", __func__, p->stream); + p->status =3D USB_RET_STALL; + return; } =20 static void usb_uas_unrealize(USBDevice *dev) --=20 2.31.1