IRDA: Replace hard-coded dev_self[] array sizes with ARRAY_SIZE()
PATCH 1/1 IRDA: Replace hard-coded dev_self[] array sizes with ARRAY_SIZE()
Several IR drivers used "for (i = 0; i < 4; i++)" to walk their dev_self[] table. Better to use ARRAY_SIZE(). And fix ali-ircc so it won't run off the end if we find too many adapters.
Signed-off-by Bjorn Helgaas <[email protected]>
drivers/net/irda/w83977af_ir.c +2 -2
@@ -117,7 +117,7 @@IRDA_DEBUG (0 ,"%s()\n" , __FUNCTION__ ); -for (i=0 ; (io[i] <2000 ) && (i <4 ); i++) { +for (i=0 ; (io[i] <2000 ) && (i <ARRAY_SIZE (dev_self)); i++) {if (w83977af_open (i, io[i], irq[i], dma[i]) ==0 )return 0 ; }
@@ -136,7 +136,7 @@IRDA_DEBUG (4 ,"%s()\n" , __FUNCTION__ ); -for (i=0 ; i <4 ; i++) { +for (i=0 ; i <ARRAY_SIZE (dev_self); i++) {if (dev_self[i])w83977af_close (dev_self[i]); }
drivers/net/irda/via-ircc.c +4 -1
@@ -279,7 +279,7 @@IRDA_DEBUG (3 ,"%s()\n" , __FUNCTION__); -for (i=0 ; i <4 ; i++) { +for (i=0 ; i <ARRAY_SIZE (dev_self); i++) {if (dev_self[i])via_ircc_close (dev_self[i]); }
@@ -327,6 +327,9 @@IRDA_DEBUG (3 ,"%s()\n" , __FUNCTION__); +if (i >=ARRAY_SIZE (dev_self)) +return -ENOMEM ; +/* Allocate new instance of the driver */ dev =alloc_irdadev (sizeof (struct via_ircc_cb ));if (dev ==NULL )
drivers/net/irda/ali-ircc.c +7 -1
@@ -249,7 +249,7 @@IRDA_DEBUG (2 ,"%s(), ---------------- Start ----------------\n" , __FUNCTION__); -for (i=0 ; i <4 ; i++) { +for (i=0 ; i <ARRAY_SIZE (dev_self); i++) {if (dev_self[i])ali_ircc_close (dev_self[i]); }
@@ -273,6 +273,12 @@int err;IRDA_DEBUG (2 ,"%s(), ---------------- Start ----------------\n" , __FUNCTION__); + +if (i >=ARRAY_SIZE (dev_self)) { +IRDA_ERROR ("%s(), maximum number of supported chips reached!\n" , + __FUNCTION__); +return -ENOMEM ; + }/* Set FIR FIFO and DMA Threshold */ if ((ali_ircc_setup (info)) ==-1 )
drivers/net/irda/irport.c +2 -2
@@ -1090,7 +1090,7 @@ {int i; -for (i=0 ; (io[i] <2000 ) && (i <4 ); i++) { +for (i=0 ; (io[i] <2000 ) && (i <ARRAY_SIZE (dev_self)); i++) {if (irport_open (i, io[i], irq[i]) !=NULL )return 0 ; }
@@ -1112,7 +1112,7 @@IRDA_DEBUG (4 ,"%s()\n" , __FUNCTION__); -for (i=0 ; i <4 ; i++) { +for (i=0 ; i <ARRAY_SIZE (dev_self); i++) {if (dev_self[i])irport_close (dev_self[i]); }