38 lines
1.5 KiB
Diff
38 lines
1.5 KiB
Diff
|
From d96c34e132df55ca7be458095f23d81dfc14e0d5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jonathan Cameron <Jonathan.Cameron@huawei.com>
|
||
|
|
Date: Fri, 1 Nov 2024 13:39:17 +0000
|
||
|
|
Subject: [PATCH] hw/cxl: Ensure there is enough data to read the input header
|
||
|
|
in cmd_get_physical_port_state()
|
||
|
|
|
||
|
|
If len_in is smaller than the header length then the accessing the
|
||
|
|
number of ports will result in an out of bounds access.
|
||
|
|
Add a check to avoid this.
|
||
|
|
|
||
|
|
Reported-by: Esifiel <esifiel@gmail.com>
|
||
|
|
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
|
||
|
|
Message-Id: <20241101133917.27634-11-Jonathan.Cameron@huawei.com>
|
||
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
Signed-off-by: Zhongrui Tang <tangzhongrui_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
hw/cxl/cxl-mailbox-utils.c | 3 +++
|
||
|
|
1 file changed, 3 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/hw/cxl/cxl-mailbox-utils.c b/hw/cxl/cxl-mailbox-utils.c
|
||
|
|
index 6eff56fb1b..11a26525a2 100644
|
||
|
|
--- a/hw/cxl/cxl-mailbox-utils.c
|
||
|
|
+++ b/hw/cxl/cxl-mailbox-utils.c
|
||
|
|
@@ -505,6 +505,9 @@ static CXLRetCode cmd_get_physical_port_state(const struct cxl_cmd *cmd,
|
||
|
|
in = (struct cxl_fmapi_get_phys_port_state_req_pl *)payload_in;
|
||
|
|
out = (struct cxl_fmapi_get_phys_port_state_resp_pl *)payload_out;
|
||
|
|
|
||
|
|
+ if (len_in < sizeof(*in)) {
|
||
|
|
+ return CXL_MBOX_INVALID_PAYLOAD_LENGTH;
|
||
|
|
+ }
|
||
|
|
/* Check if what was requested can fit */
|
||
|
|
if (sizeof(*out) + sizeof(*out->ports) * in->num_ports > cci->payload_max) {
|
||
|
|
return CXL_MBOX_INVALID_INPUT;
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|