Skip to contentSkip to conversation

soc: xilinx: versal: fix out of bounds array access

PATCH Applied Jorge Ramirez-Ortiz 2 participants 3 messages Apr 16, 2022 – Apr 20, 2022 Arm/Zynq architecture

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 soc: xilinx: versal: fix out of bounds array access

The call to xilinx_pm_request requires an array of a larger size.

---
 drivers/soc/soc_xilinx_versal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/soc_xilinx_versal.c +1 -1
index f8bcd9ab40..3d8c25c19b 100644
@@ -45,7 +45,7 @@ static const struct soc_ops soc_xilinx_versal_ops = {
 static int soc_xilinx_versal_probe(struct udevice *dev)
 {
 	struct soc_xilinx_versal_priv *priv = dev_get_priv(dev);
-	u32 ret_payload[4];
+	u32 ret_payload[PAYLOAD_ARG_CNT];
 	int ret;
 
 	priv->family = versal_family;
Signature · 1 line
2.34.1
#1 lore raw
Quoted 12 lines · Jorge Ramirez-Ortiz

The call to xilinx_pm_request requires an array of a larger size.

---
 drivers/soc/soc_xilinx_versal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/soc_xilinx_versal.c +0 -0
index f8bcd9ab40..3d8c25c19b 100644

drivers/soc/soc_xilinx_versal.c static const struct soc_ops soc_xilinx_versal_ops = { · line 48

Quoted 5 lines
drivers/soc/soc_xilinx_versal.c +1 -1
@@ -45,7 +45,7 @@ static const struct soc_ops soc_xilinx_versal_ops = {
 static int soc_xilinx_versal_probe(struct udevice *dev)
 {
 	struct soc_xilinx_versal_priv *priv = dev_get_priv(dev);
-	u32 ret_payload[4];
+	u32 ret_payload[PAYLOAD_ARG_CNT];

all good? can this be merged?

Quoted 6 lines
drivers/soc/soc_xilinx_versal.c +0 -0
 	int ret;
 
 	priv->family = versal_family;
Signature · 1 line
2.34.1
Applied
#2 lore raw
In reply to Jorge Ramirez-Ortiz
Quoted 12 lines · Jorge Ramirez-Ortiz

The call to xilinx_pm_request requires an array of a larger size.

---
  drivers/soc/soc_xilinx_versal.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/soc_xilinx_versal.c +0 -0
index f8bcd9ab40..3d8c25c19b 100644

drivers/soc/soc_xilinx_versal.c static const struct soc_ops soc_xilinx_versal_ops = { · line 51

Quoted 8 lines
drivers/soc/soc_xilinx_versal.c +1 -1
@@ -45,7 +45,7 @@ static const struct soc_ops soc_xilinx_versal_ops = {
  static int soc_xilinx_versal_probe(struct udevice *dev)
  {
  	struct soc_xilinx_versal_priv *priv = dev_get_priv(dev);
-	u32 ret_payload[4];
+	u32 ret_payload[PAYLOAD_ARG_CNT];
  	int ret;
 
  	priv->family = versal_family;

Applied.
M