From: Jonathan Cameron via <qemu-devel@nongnu.org>
To: "Michael Tokarev" <mjt@tls.msk.ru>,
qemu-devel@nongnu.org, "Michael Tsirkin" <mst@redhat.com>,
"Fan Ni" <fan.ni@samsung.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Cc: linuxarm@huawei.com, "Peter Maydell" <peter.maydell@linaro.org>,
"Yuquan Wang" <wangyuquan1236@phytium.com.cn>,
"Dave Jiang" <dave.jiang@intel.com>,
"Ira Weiny" <ira.weiny@intel.com>,
"Daniel P . Berrangé" <berrange@redhat.com>,
"Warner Losh" <imp@bsdimp.com>
Subject: [PATCH v2 1/3] hw/cxl: Fix out of bound array access
Date: Tue, 19 Sep 2023 11:19:25 +0100 [thread overview]
Message-ID: <20230919101927.1470-2-Jonathan.Cameron@huawei.com> (raw)
In-Reply-To: <20230919101927.1470-1-Jonathan.Cameron@huawei.com>
From: Dmitry Frolov <frolov@swemel.ru>
According to cxl_interleave_ways_enc(), fw->num_targets is allowed to be up
to 16. This also corresponds to CXL r3.0 spec. So, the fw->target_hbs[]
array is iterated from 0 to 15. But it is statically declared of length 8.
Thus, out of bound array access may occur.
Fixes: c28db9e000 ("hw/pci-bridge: Make PCIe and CXL PXB Devices inherit from TYPE_PXB_DEV")
Signed-off-by: Dmitry Frolov <frolov@swemel.ru>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Link: https://lore.kernel.org/r/20230913101055.754709-1-frolov@swemel.ru
Cc: qemu-stable@nongnu.org
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
---
V2: Typo fix in description.
---
include/hw/cxl/cxl.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/hw/cxl/cxl.h b/include/hw/cxl/cxl.h
index 56c9e7676e..4944725849 100644
--- a/include/hw/cxl/cxl.h
+++ b/include/hw/cxl/cxl.h
@@ -29,7 +29,7 @@ typedef struct PXBCXLDev PXBCXLDev;
typedef struct CXLFixedWindow {
uint64_t size;
char **targets;
- PXBCXLDev *target_hbs[8];
+ PXBCXLDev *target_hbs[16];
uint8_t num_targets;
uint8_t enc_int_ways;
uint8_t enc_int_gran;
--
2.39.2
next prev parent reply other threads:[~2023-09-19 10:20 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-19 10:19 [PATCH v2 0/3] hw/cxl: Misc small fixes Jonathan Cameron via
2023-09-19 10:19 ` Jonathan Cameron via [this message]
2023-09-19 10:19 ` [PATCH v2 2/3] hw/mem/cxl_type3: Add missing copyright and license notice Jonathan Cameron via
2023-09-20 14:11 ` Philippe Mathieu-Daudé
2023-09-20 14:25 ` Michael Tokarev
2023-09-19 10:19 ` [PATCH v2 3/3] docs/cxl: Cleanout some more aarch64 examples Jonathan Cameron via
2023-09-20 5:00 ` [PATCH v2 0/3] hw/cxl: Misc small fixes Michael Tokarev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230919101927.1470-2-Jonathan.Cameron@huawei.com \
--to=qemu-devel@nongnu.org \
--cc=Jonathan.Cameron@huawei.com \
--cc=berrange@redhat.com \
--cc=dave.jiang@intel.com \
--cc=fan.ni@samsung.com \
--cc=imp@bsdimp.com \
--cc=ira.weiny@intel.com \
--cc=linuxarm@huawei.com \
--cc=mjt@tls.msk.ru \
--cc=mst@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=wangyuquan1236@phytium.com.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).