From 40e2e5c38ec35375d18c8e7d49cd0f1f1d31d4bd Mon Sep 17 00:00:00 2001 From: marco <49691247+marcoSchr@users.noreply.github.com> Date: Sat, 8 Feb 2025 19:02:36 +0100 Subject: [PATCH] NVM: fixed bound check error in nvm_getDesc() --- platform/drivers/NVM/nvmem_GDx.c | 2 +- platform/drivers/NVM/nvmem_MDx.c | 2 +- platform/drivers/NVM/nvmem_linux.c | 2 +- platform/drivers/NVM/nvmem_ttwrplus.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/platform/drivers/NVM/nvmem_GDx.c b/platform/drivers/NVM/nvmem_GDx.c index 40dd3cb8..ecf2fab7 100644 --- a/platform/drivers/NVM/nvmem_GDx.c +++ b/platform/drivers/NVM/nvmem_GDx.c @@ -134,7 +134,7 @@ void nvm_terminate() const struct nvmDescriptor *nvm_getDesc(const size_t index) { - if(index > 2) + if(index >= ARRAY_SIZE(nvmDevices)) return NULL; return &nvmDevices[index]; diff --git a/platform/drivers/NVM/nvmem_MDx.c b/platform/drivers/NVM/nvmem_MDx.c index 10597c88..f49745d2 100644 --- a/platform/drivers/NVM/nvmem_MDx.c +++ b/platform/drivers/NVM/nvmem_MDx.c @@ -89,7 +89,7 @@ void nvm_terminate() const struct nvmDescriptor *nvm_getDesc(const size_t index) { - if(index > 3) + if(index >= ARRAY_SIZE(nvmDevices)) return NULL; return &nvmDevices[index]; diff --git a/platform/drivers/NVM/nvmem_linux.c b/platform/drivers/NVM/nvmem_linux.c index f0a64621..e79a679e 100644 --- a/platform/drivers/NVM/nvmem_linux.c +++ b/platform/drivers/NVM/nvmem_linux.c @@ -152,7 +152,7 @@ void nvm_terminate() const struct nvmDescriptor *nvm_getDesc(const size_t index) { - if(index > 0) + if(index >= 0) return NULL; return &stateNvm; diff --git a/platform/drivers/NVM/nvmem_ttwrplus.c b/platform/drivers/NVM/nvmem_ttwrplus.c index 3bdc585f..7862b323 100644 --- a/platform/drivers/NVM/nvmem_ttwrplus.c +++ b/platform/drivers/NVM/nvmem_ttwrplus.c @@ -46,7 +46,7 @@ void nvm_terminate() const struct nvmDescriptor *nvm_getDesc(const size_t index) { - if(index > 0) + if(index >= 0) return NULL; return &nvMemory;