From patchwork Wed May 20 15:24:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prasad Pandit X-Patchwork-Id: 11560589 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E4FEF138A for ; Wed, 20 May 2020 15:28:01 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BB35F206F1 for ; Wed, 20 May 2020 15:28:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="VF+M/WF0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BB35F206F1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:42150 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jbQdV-0002oR-0m for patchwork-qemu-devel@patchwork.kernel.org; Wed, 20 May 2020 11:28:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37940) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jbQcl-0001cT-Gh for qemu-devel@nongnu.org; Wed, 20 May 2020 11:27:15 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:50373 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jbQck-00049S-Mi for qemu-devel@nongnu.org; Wed, 20 May 2020 11:27:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589988433; 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=MDpRQ+rDrzTLPgzEeM46870/HP2rRmnnKlmhzL4vErI=; b=VF+M/WF0Kpt5Bs0hwXr+ShqDrPGPiF8RmVy1/l5bOT30Fgs2GE9c+oG9leqy3UEM/y5ocg 48EWEJ/kcVlWYkHj3reIjat1b9zf0mCfsrG5C/Rv8Hre1cAt64FeHeuPjX8DVjmXitU8si Hiy8TPuirPjiQpU9PADEA785fqFItio= 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-326-HU2rdB8eNieOTM9pT0OJzw-1; Wed, 20 May 2020 11:27:11 -0400 X-MC-Unique: HU2rdB8eNieOTM9pT0OJzw-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3CE471083E83; Wed, 20 May 2020 15:27:10 +0000 (UTC) Received: from localhost.localdomain (unknown [10.74.9.62]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9EF9D70873; Wed, 20 May 2020 15:27:06 +0000 (UTC) From: P J P To: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 1/2] sd: check bit number before setting card_status flag Date: Wed, 20 May 2020 20:54:49 +0530 Message-Id: <20200520152450.200362-2-ppandit@redhat.com> In-Reply-To: <20200520152450.200362-1-ppandit@redhat.com> References: <20200520152450.200362-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.61; envelope-from=ppandit@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/20 02:22: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_H2=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: Alexander Bulekov , QEMU Developers , Stefan Hajnoczi , Prasad J Pandit Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Prasad J Pandit SD card emulator sets 'sd->card_status' while performing block write commands. While doing so, it tests the corresponding bit derived from 's->data_start' address. This may lead to OOB access. Add check to avoid it. Reported-by: Alex Signed-off-by: Prasad J Pandit --- hw/sd/sd.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 71a9af09ab..916e9fff58 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -802,7 +802,12 @@ static void sd_function_switch(SDState *sd, uint32_t arg) static inline bool sd_wp_addr(SDState *sd, uint64_t addr) { - return test_bit(sd_addr_to_wpnum(addr), sd->wp_groups); + uint64_t bit = sd_addr_to_wpnum(addr); + + if (bit < sd->wpgrps_size) { + return test_bit(bit, sd->wp_groups); + } + return true; } static void sd_lock_command(SDState *sd) From patchwork Wed May 20 15:24:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prasad Pandit X-Patchwork-Id: 11560591 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9092E60D for ; Wed, 20 May 2020 15:28:14 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 66B6E206F1 for ; Wed, 20 May 2020 15:28:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="gTVX6ycc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 66B6E206F1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:42540 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jbQdh-0002ya-Gr for patchwork-qemu-devel@patchwork.kernel.org; Wed, 20 May 2020 11:28:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37944) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jbQco-0001hv-Hy for qemu-devel@nongnu.org; Wed, 20 May 2020 11:27:18 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:54829 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jbQcn-0004AF-S7 for qemu-devel@nongnu.org; Wed, 20 May 2020 11:27:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589988436; 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=7GD0rL/sqDpsLL+cI8BCGnwhH7eRrFS2B9ck/sbzo0g=; b=gTVX6ycc/MHwn79MIjFpFNZ1YSK5q3X87evYVD97mw/84RYyuLmBKuqlSQvL0UJDtPJVkD EYhBltJaFS6hkCIIaqrcPvLCwjs7lEWt8K477Cm/8YJnfvAYxaKJqTawSsjpLO1SKEBggC dbReD62cPXOxcOy12/+9yCrMrTD9O50= 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-485-ylUqvUwrNzqGNU724sDtkg-1; Wed, 20 May 2020 11:27:14 -0400 X-MC-Unique: ylUqvUwrNzqGNU724sDtkg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7719A107ACF3; Wed, 20 May 2020 15:27:13 +0000 (UTC) Received: from localhost.localdomain (unknown [10.74.9.62]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 31DAC70873; Wed, 20 May 2020 15:27:10 +0000 (UTC) From: P J P To: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 2/2] sd: disable sdhci-pci device by default Date: Wed, 20 May 2020 20:54:50 +0530 Message-Id: <20200520152450.200362-3-ppandit@redhat.com> In-Reply-To: <20200520152450.200362-1-ppandit@redhat.com> References: <20200520152450.200362-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=207.211.31.120; envelope-from=ppandit@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/20 01:34:51 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: Alexander Bulekov , QEMU Developers , Stefan Hajnoczi , Prasad J Pandit Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Prasad J Pandit Disable rarely used sdhci-pci device build by default. Suggested-by: Stefan Hajnoczi Signed-off-by: Prasad J Pandit --- hw/sd/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/sd/Kconfig b/hw/sd/Kconfig index c5e1e5581c..93dea61285 100644 --- a/hw/sd/Kconfig +++ b/hw/sd/Kconfig @@ -16,6 +16,5 @@ config SDHCI config SDHCI_PCI bool - default y if PCI_DEVICES depends on PCI select SDHCI