From nobody Thu May 2 21:26:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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=1562583083; cv=none; d=zoho.com; s=zohoarc; b=Zm323AJnrVVzpEeDCtyHhs0+KXAAo+cBhtdiL0/xqo3IqkZkPxfPX1zbx6IQAYIJ6PWO7nUzxex5BbGssLyoLfuyxghn2te7Y2xoL8S6AfBL9eUCK0LQNJbYKilfs+GIiEjN/4GW/erSxHYquQKp7AI0YP+/bmkVeJ+HNOAB9lY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562583083; 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:ARC-Authentication-Results; bh=gThjHameDi/JwQE5Qsfxn0afvVjVIx1Q8m2q5XtnGOU=; b=YooFcSyT8PRzpPihCJJCDcRN1NTCKbeQKIueJ5I7XysK3t2LBxEBHQea33DkjXN3ZdUN8levXr8QvurhNdF8u7E0Dfkbubay4mMaW8x8ZlGgiHhXAXlKTFXQW1bu0IUdX/5/ImChyKXMlbC2QMBttIlrGgLLsElFbN1rRxFc9Dc= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562583083993478.73453842836955; Mon, 8 Jul 2019 03:51:23 -0700 (PDT) Received: from localhost ([::1]:40348 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkREl-0004sJ-8X for importer@patchew.org; Mon, 08 Jul 2019 06:51:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39876) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkRC0-0002on-Oh for qemu-devel@nongnu.org; Mon, 08 Jul 2019 06:48:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkRBz-0006Da-N3 for qemu-devel@nongnu.org; Mon, 08 Jul 2019 06:48:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59108) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hkRBw-0006A2-JJ; Mon, 08 Jul 2019 06:48:16 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id 4AABAC05B03F; Mon, 8 Jul 2019 10:48:13 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-112.brq.redhat.com [10.40.204.112]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9E46857984; Mon, 8 Jul 2019 10:48:08 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Mon, 8 Jul 2019 12:47:48 +0200 Message-Id: <20190708104750.1071-2-philmd@redhat.com> In-Reply-To: <20190708104750.1071-1-philmd@redhat.com> References: <20190708104750.1071-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 08 Jul 2019 10:48:13 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH-for-4.1 v5 1/3] hw/ssi/xilinx_spips: Convert lqspi_read() to read_with_attrs 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: Peter Maydell , Francisco Iglesias , Alistair Francis , qemu-stable@nongnu.org, Prasad J Pandit , Lei Sun , qemu-arm@nongnu.org, "Edgar E. Iglesias" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" In the next commit we will implement the write_with_attrs() handler. To avoid using different APIs, convert the read() handler first. Reviewed-by: Francisco Iglesias Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- v4: Do not ignore lqspi_read() return value (Francisco) --- hw/ssi/xilinx_spips.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c index 8115bb6d46..b7c7275dbe 100644 --- a/hw/ssi/xilinx_spips.c +++ b/hw/ssi/xilinx_spips.c @@ -1202,27 +1202,26 @@ static void lqspi_load_cache(void *opaque, hwaddr a= ddr) } } =20 -static uint64_t -lqspi_read(void *opaque, hwaddr addr, unsigned int size) +static MemTxResult lqspi_read(void *opaque, hwaddr addr, uint64_t *value, + unsigned size, MemTxAttrs attrs) { - XilinxQSPIPS *q =3D opaque; - uint32_t ret; + XilinxQSPIPS *q =3D XILINX_QSPIPS(opaque); =20 if (addr >=3D q->lqspi_cached_addr && addr <=3D q->lqspi_cached_addr + LQSPI_CACHE_SIZE - 4) { uint8_t *retp =3D &q->lqspi_buf[addr - q->lqspi_cached_addr]; - ret =3D cpu_to_le32(*(uint32_t *)retp); - DB_PRINT_L(1, "addr: %08x, data: %08x\n", (unsigned)addr, - (unsigned)ret); - return ret; - } else { - lqspi_load_cache(opaque, addr); - return lqspi_read(opaque, addr, size); + *value =3D cpu_to_le32(*(uint32_t *)retp); + DB_PRINT_L(1, "addr: %08" HWADDR_PRIx ", data: %08" PRIx64 "\n", + addr, *value); + return MEMTX_OK; } + + lqspi_load_cache(opaque, addr); + return lqspi_read(opaque, addr, value, size, attrs); } =20 static const MemoryRegionOps lqspi_ops =3D { - .read =3D lqspi_read, + .read_with_attrs =3D lqspi_read, .endianness =3D DEVICE_NATIVE_ENDIAN, .valid =3D { .min_access_size =3D 1, --=20 2.20.1 From nobody Thu May 2 21:26:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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=1562583095; cv=none; d=zoho.com; s=zohoarc; b=ol1zx9Io1gPqfQ2TTh4U+83svHC2UGsXAIabtsOFtu695rDvZQoKHNxRMu26NppQQYHxPFUsND9JjkcX+JH2hE0L70gXzMCitVi3Fl20vVyPH1mcUfguUS2g7mpn0eB6ZrLCAjcHycJaKf1kCI1nvh4Nkj3OZuqFt+G77mwptsI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562583095; 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:ARC-Authentication-Results; bh=Y/qK6wnCYYVhyqInXeWbmnzabQeYOGdFBRU+ssWpyoc=; b=ct4BAYuYNCan5Igim49eb0l75VCwvYHZV9zrXeLhx4zypKoxayoVCjWHTlTqR/Yflqx2jJfYlL1vIjQXF3b6A0+vvVM0kIHDAxArcPclx+NpRleBmoWWba4lVYvYvYSC5LpXyW8l6w0bry+U7RIJcPvKjowqsZLNvF57Kg2Op/I= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 1562583095459620.4353980328575; Mon, 8 Jul 2019 03:51:35 -0700 (PDT) Received: from localhost ([::1]:40354 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkRF8-0005tK-HG for importer@patchew.org; Mon, 08 Jul 2019 06:51:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39928) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkRC8-0002xN-K5 for qemu-devel@nongnu.org; Mon, 08 Jul 2019 06:48:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkRC7-0006HT-Dj for qemu-devel@nongnu.org; Mon, 08 Jul 2019 06:48:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57788) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hkRC3-0006FW-Me; Mon, 08 Jul 2019 06:48:23 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id DA1AF3002738; Mon, 8 Jul 2019 10:48:17 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-112.brq.redhat.com [10.40.204.112]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BD6CE2E03C; Mon, 8 Jul 2019 10:48:13 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Mon, 8 Jul 2019 12:47:49 +0200 Message-Id: <20190708104750.1071-3-philmd@redhat.com> In-Reply-To: <20190708104750.1071-1-philmd@redhat.com> References: <20190708104750.1071-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Mon, 08 Jul 2019 10:48:17 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH-for-4.1 v5 2/3] hw/ssi/xilinx_spips: Avoid AXI writes to the LQSPI linear memory 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: Peter Maydell , Francisco Iglesias , Alistair Francis , qemu-stable@nongnu.org, Prasad J Pandit , Lei Sun , qemu-arm@nongnu.org, "Edgar E. Iglesias" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Lei Sun found while auditing the code that a CPU write would trigger a NULL pointer dereference. From UG1085 datasheet [*] AXI writes in this region are ignored and generates an AXI Slave Error (SLVERR). Fix by implementing the write_with_attrs() handler. Return MEMTX_ERROR when the region is accessed (this error maps to an AXI slave error). [*] https://www.xilinx.com/support/documentation/user_guides/ug1085-zynq-ul= trascale-trm.pdf Reported-by: Lei Sun Reviewed-by: Francisco Iglesias Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- v4: Fix typos (Francisco) --- hw/ssi/xilinx_spips.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c index b7c7275dbe..3c4e8365ee 100644 --- a/hw/ssi/xilinx_spips.c +++ b/hw/ssi/xilinx_spips.c @@ -1220,8 +1220,24 @@ static MemTxResult lqspi_read(void *opaque, hwaddr a= ddr, uint64_t *value, return lqspi_read(opaque, addr, value, size, attrs); } =20 +static MemTxResult lqspi_write(void *opaque, hwaddr offset, uint64_t value, + unsigned size, MemTxAttrs attrs) +{ + /* + * From UG1085, Chapter 24 (Quad-SPI controllers): + * - Writes are ignored + * - AXI writes generate an external AXI slave error (SLVERR) + */ + qemu_log_mask(LOG_GUEST_ERROR, "%s Unexpected %u-bit access to 0x%" PR= Ix64 + " (value: 0x%" PRIx64 "\n", + __func__, size << 3, offset, value); + + return MEMTX_ERROR; +} + static const MemoryRegionOps lqspi_ops =3D { .read_with_attrs =3D lqspi_read, + .write_with_attrs =3D lqspi_write, .endianness =3D DEVICE_NATIVE_ENDIAN, .valid =3D { .min_access_size =3D 1, --=20 2.20.1 From nobody Thu May 2 21:26:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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=1562583181; cv=none; d=zoho.com; s=zohoarc; b=mfba3ZDYkeMd6rAtlIqxvrhLAkzK+oeK+zs/NVtWKqovvzJ51IvaPo8rbKqBlB90IfL5rvADicJys5unhjz+nutt1S8UeCa3FWxz0kP6FNzmchdf3kkVlC5IxQhNa9/ziply5I8X7lk9r493rMd6a4clu5jSLh61z9awJtjb3DE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562583181; 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:ARC-Authentication-Results; bh=LDInV+w4ZeXuaMPzxIvXlVye/WE0ytZH7yR7hD92dzw=; b=n15KmUFRrQAf0zWGkFKL9bnGEbt4mSI/R8yDaj85mARsU4q0Gmfbg2NL75N7Z3QmBWwVehyN85lbeQQl9SSq+6/m/IZwXck6ZA9bWe1pHzUhdR2cfzcyweu/ZxmUtcIQbod9gHOVZdxe+yB0Sd9wW0jb86+XkYM4u34QQokr03s= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 1562583181028818.104111144633; Mon, 8 Jul 2019 03:53:01 -0700 (PDT) Received: from localhost ([::1]:40370 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkRGU-0007AQ-3t for importer@patchew.org; Mon, 08 Jul 2019 06:52:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39977) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkRCC-00031X-23 for qemu-devel@nongnu.org; Mon, 08 Jul 2019 06:48:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkRCB-0006Jq-22 for qemu-devel@nongnu.org; Mon, 08 Jul 2019 06:48:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46770) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hkRC8-0006Hw-K9; Mon, 08 Jul 2019 06:48:28 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id 0B6E02DE413; Mon, 8 Jul 2019 10:48:24 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-112.brq.redhat.com [10.40.204.112]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A66662E03C; Mon, 8 Jul 2019 10:48:18 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Mon, 8 Jul 2019 12:47:50 +0200 Message-Id: <20190708104750.1071-4-philmd@redhat.com> In-Reply-To: <20190708104750.1071-1-philmd@redhat.com> References: <20190708104750.1071-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 08 Jul 2019 10:48:24 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH-for-4.1 v5 3/3] hw/ssi/xilinx_spips: Avoid out-of-bound access to lqspi_buf[] 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: Peter Maydell , Francisco Iglesias , Alistair Francis , qemu-stable@nongnu.org, Prasad J Pandit , Lei Sun , qemu-arm@nongnu.org, "Edgar E. Iglesias" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Both lqspi_read() and lqspi_load_cache() expect a 32-bit aligned address. From UG1085 datasheet [*] Chapter 22: Quad-SPI Controller: Transfer Size Limitations Because of the 32-bit wide TX, RX, and generic FIFO, all APB/AXI transfers must be an integer multiple of 4-bytes. Shorter transfers are not possible. Set MemoryRegionOps.impl values to force 32-bit accesses, this way we are sure we do not access the lqspi_buf[] array out of bound. [*] https://www.xilinx.com/support/documentation/user_guides/ug1085-zynq-ul= trascale-trm.pdf Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Francisco Iglesias =20 Tested-by: Francisco Iglesias --- v5: add datasheet reference, drop RFC prefix, fix build (Francisco) --- hw/ssi/xilinx_spips.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c index 3c4e8365ee..b29e0a4a89 100644 --- a/hw/ssi/xilinx_spips.c +++ b/hw/ssi/xilinx_spips.c @@ -1239,6 +1239,10 @@ static const MemoryRegionOps lqspi_ops =3D { .read_with_attrs =3D lqspi_read, .write_with_attrs =3D lqspi_write, .endianness =3D DEVICE_NATIVE_ENDIAN, + .impl =3D { + .min_access_size =3D 4, + .max_access_size =3D 4, + }, .valid =3D { .min_access_size =3D 1, .max_access_size =3D 4 --=20 2.20.1