Skip to contentSkip to conversation

lib: utils/ipi: buffer overrun aclint_mswi_cold_init

PATCH New Heinrich Schuchardt 3 participants 3 messages May 29, 2023 – Jun 4, 2023

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 lib: utils/ipi: buffer overrun aclint_mswi_cold_init

The parameter checks in aclint_mswi_cold_init() don't guard against a buffer overrun.

mswi_hartid2data is defined as an array of SBI_HARTMASK_MAX_BITS entries. The current check allows

    mswi->hart_count = ACLINT_MSWI_MAX_HARTS
    mswi->first_hartid = SBI_HARTMASK_MAX_BITS - 1.

With these values mswi_hartid2data will be accessed at index

SBI_HARTMASK_MAX_BITS + SBI_HARTMASK_MAX_BITS - 2.

We have to check the sum of mswi->first_hartid and mswi->hart_count.

Furthermore mswi->hart_count = 0 would not make much sense.

Addresses-Coverity-ID: 1529705 ("Out-of-bounds write")

Fixes 5a049fe1d6a5 ("lib: utils/ipi: Add ACLINT MSWI library")

---
v2:
add missing 'Fixes:'

---
 lib/utils/ipi/aclint_mswi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
lib/utils/ipi/aclint_mswi.c +2 -2
index 6b004cb..ac8570b 100644
@@ -75,8 +75,8 @@ int aclint_mswi_cold_init(struct aclint_mswi_data *mswi)
 	/* Sanity checks */
 	if (!mswi || (mswi->addr & (ACLINT_MSWI_ALIGN - 1)) ||
 	    (mswi->size < (mswi->hart_count * sizeof(u32))) ||
-	    (mswi->first_hartid >= SBI_HARTMASK_MAX_BITS) ||
-	    (mswi->hart_count > ACLINT_MSWI_MAX_HARTS))
+	    (mswi->first_hartid + mswi->hart_count > SBI_HARTMASK_MAX_BITS) ||
+	    (!mswi->hart_count || mswi->hart_count > ACLINT_MSWI_MAX_HARTS))
 		return SBI_EINVAL;
 
 	/* Update MSWI hartid table */
Signature · 1 line
2.39.2
#1 lore raw

PATCH v2 1/1 lib: utils/ipi: buffer overrun aclint_mswi_cold_init

? 2023-05-29???? 11:27 +0200?Heinrich Schuchardt???

Quoted 13 lines

The parameter checks in aclint_mswi_cold_init() don't guard against a buffer overrun.

mswi_hartid2data is defined as an array of SBI_HARTMASK_MAX_BITS entries. The current check allows

??? mswi->hart_count = ACLINT_MSWI_MAX_HARTS ??? mswi->first_hartid = SBI_HARTMASK_MAX_BITS - 1.

With these values mswi_hartid2data will be accessed at index

??? SBI_HARTMASK_MAX_BITS + SBI_HARTMASK_MAX_BITS - 2.

Quoted 7 lines

We have to check the sum of mswi->first_hartid and mswi->hart_count.

Furthermore mswi->hart_count = 0 would not make much sense.

Addresses-Coverity-ID: 1529705 ("Out-of-bounds write")

Fixes 5a049fe1d6a5 ("lib: utils/ipi: Add ACLINT MSWI library")

LGTM

Quoted 26 lines

---
v2:
????????add missing 'Fixes:'
---
?lib/utils/ipi/aclint_mswi.c | 4 ++--
?1 file changed, 2 insertions(+), 2 deletions(-)

lib/utils/ipi/aclint_mswi.c +0 -0
index 6b004cb..ac8570b 100644
@@ -75,8 +75,8 @@ int aclint_mswi_cold_init(struct aclint_mswi_data *mswi)

????????/* Sanity checks */

????????if (!mswi || (mswi->addr & (ACLINT_MSWI_ALIGN - 1)) ||
??????????? (mswi->size < (mswi->hart_count * sizeof(u32))) ||

-?????????? (mswi->first_hartid >= SBI_HARTMASK_MAX_BITS) || -?????????? (mswi->hart_count > ACLINT_MSWI_MAX_HARTS)) +?????????? (mswi->first_hartid + mswi->hart_count > SBI_HARTMASK_MAX_BITS) || +?????????? (!mswi->hart_count || mswi->hart_count > ACLINT_MSWI_MAX_HARTS)) ????????????????return SBI_EINVAL;
?
????????/* Update MSWI hartid table */

Signature · 1 line
2.39.2
Applied
#2 lore raw

PATCH v2 1/1 lib: utils/ipi: buffer overrun aclint_mswi_cold_init

In reply to Heinrich Schuchardt
Quoted 14 lines · On Mon, May 29, 2023 at 2:57?PM Heinrich Schuchardt…

The parameter checks in aclint_mswi_cold_init() don't guard against a buffer overrun.

mswi_hartid2data is defined as an array of SBI_HARTMASK_MAX_BITS entries. The current check allows

    mswi->hart_count = ACLINT_MSWI_MAX_HARTS
    mswi->first_hartid = SBI_HARTMASK_MAX_BITS - 1.

With these values mswi_hartid2data will be accessed at index

SBI_HARTMASK_MAX_BITS + SBI_HARTMASK_MAX_BITS - 2.

Quoted 7 lines

We have to check the sum of mswi->first_hartid and mswi->hart_count.

Furthermore mswi->hart_count = 0 would not make much sense.

Addresses-Coverity-ID: 1529705 ("Out-of-bounds write")

Fixes 5a049fe1d6a5 ("lib: utils/ipi: Add ACLINT MSWI library")

Looks good to me.

Applied this patch to the riscv/opensbi repo.

Thanks,
Anup

Quoted 25 lines

---
v2:
add missing 'Fixes:'

---
 lib/utils/ipi/aclint_mswi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
lib/utils/ipi/aclint_mswi.c +2 -3
index 6b004cb..ac8570b 100644
@@ -75,8 +75,8 @@ int aclint_mswi_cold_init(struct aclint_mswi_data *mswi)
        /* Sanity checks */
        if (!mswi || (mswi->addr & (ACLINT_MSWI_ALIGN - 1)) ||
            (mswi->size < (mswi->hart_count * sizeof(u32))) ||
-           (mswi->first_hartid >= SBI_HARTMASK_MAX_BITS) ||
-           (mswi->hart_count > ACLINT_MSWI_MAX_HARTS))
+           (mswi->first_hartid + mswi->hart_count > SBI_HARTMASK_MAX_BITS) ||
+           (!mswi->hart_count || mswi->hart_count > ACLINT_MSWI_MAX_HARTS))
                return SBI_EINVAL;
 
        /* Update MSWI hartid table */
--

2.39.2