Merge tag 'dma-mapping-5.15' of git://git.infradead.org/users/hch/dma-mapping

[linux-2.6-microblaze.git] / drivers / nvmem / rave-sp-eeprom.c

diff --git a/drivers/nvmem/rave-sp-eeprom.c b/drivers/nvmem/rave-sp-eeprom.c
index 50aeea6..66699d4 100644 (file)
--- a/drivers/nvmem/rave-sp-eeprom.c
+++ b/drivers/nvmem/rave-sp-eeprom.c
@@ -35,6 +35,7 @@ enum rave_sp_eeprom_header_size {
        RAVE_SP_EEPROM_HEADER_SMALL = 4U,
        RAVE_SP_EEPROM_HEADER_BIG   = 5U,
 };
+#define RAVE_SP_EEPROM_HEADER_MAX      RAVE_SP_EEPROM_HEADER_BIG
 
 #define        RAVE_SP_EEPROM_PAGE_SIZE        32U
 
@@ -97,9 +98,12 @@ static int rave_sp_eeprom_io(struct rave_sp_eeprom *eeprom,
        const unsigned int rsp_size =
                is_write ? sizeof(*page) - sizeof(page->data) : sizeof(*page);
        unsigned int offset = 0;
-       u8 cmd[cmd_size];
+       u8 cmd[RAVE_SP_EEPROM_HEADER_MAX + sizeof(page->data)];
        int ret;
 
+       if (WARN_ON(cmd_size > sizeof(cmd)))
+               return -EINVAL;
+
        cmd[offset++] = eeprom->address;
        cmd[offset++] = 0;
        cmd[offset++] = type;