Commit 3f9be35b authored by Axel Lin's avatar Axel Lin Committed by Samuel Ortiz
Browse files

mfd: rc5t583: Fix array subscript is above array bounds 



I got below build warning while compiling this driver.
It's obviously RC5T583_MAX_INTERRUPT_MASK_REGS is 9 but irq_en_add
array only has 8 elements.

  CC      drivers/mfd/rc5t583-irq.o
drivers/mfd/rc5t583-irq.c: In function 'rc5t583_irq_sync_unlock':
drivers/mfd/rc5t583-irq.c:227: warning: array subscript is above array bounds
drivers/mfd/rc5t583-irq.c: In function 'rc5t583_irq_init':
drivers/mfd/rc5t583-irq.c:349: warning: array subscript is above array bounds

Since the number of interrupt enable registers is 8, this patch adds
define for RC5T583_MAX_INTERRUPT_EN_REGS to fix this bug.

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Acked-by: default avatarLaxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 302b9562

drivers/mfd/rc5t583-irq.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -345,7 +345,7 @@ int rc5t583_irq_init(struct rc5t583 *rc5t583, int irq, int irq_base) 
	mutex_init(&rc5t583->irq_lock);

	mutex_init(&rc5t583->irq_lock);





	/* Initailize all int register to 0 */

	/* Initailize all int register to 0 */

	for (i = 0; i < RC5T583_MAX_INTERRUPT_MASK_REGS; i++)  {

	for (i = 0; i < RC5T583_MAX_INTERRUPT_EN_REGS; i++)  {

		ret = rc5t583_write(rc5t583->dev, irq_en_add[i],

		ret = rc5t583_write(rc5t583->dev, irq_en_add[i],

				rc5t583->irq_en_reg[i]);

				rc5t583->irq_en_reg[i]);

		if (ret < 0)

		if (ret < 0)

include/linux/mfd/rc5t583.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -33,6 +33,7 @@ 
/* Maximum number of main interrupts */

/* Maximum number of main interrupts */

#define MAX_MAIN_INTERRUPT		5

#define MAX_MAIN_INTERRUPT		5

#define RC5T583_MAX_GPEDGE_REG		2

#define RC5T583_MAX_GPEDGE_REG		2

#define RC5T583_MAX_INTERRUPT_EN_REGS	8

#define RC5T583_MAX_INTERRUPT_MASK_REGS	9

#define RC5T583_MAX_INTERRUPT_MASK_REGS	9





/* Interrupt enable register */

/* Interrupt enable register */
@@ -304,7 +305,7 @@ struct rc5t583 { 
	uint8_t		intc_inten_reg;

	uint8_t		intc_inten_reg;





	/* For group interrupt bits and address */

	/* For group interrupt bits and address */

	uint8_t		irq_en_reg[RC5T583_MAX_INTERRUPT_MASK_REGS];

	uint8_t		irq_en_reg[RC5T583_MAX_INTERRUPT_EN_REGS];





	/* For gpio edge */

	/* For gpio edge */

	uint8_t		gpedge_reg[RC5T583_MAX_GPEDGE_REG];

	uint8_t		gpedge_reg[RC5T583_MAX_GPEDGE_REG];

CRA Git | Maintained and supported by SUSTech CRA and CCSE