powerpc: mpc85xx/mpc86xx: Fix off-by-one boundary checking with ARRAY_SIZE
PATCH 1/1 powerpc: mpc85xx/mpc86xx: Fix off-by-one boundary checking with ARRAY_SIZE
If a variable is used as array subscript, it's valid value range is 0 ... ARRAY_SIZE -1.
Signed-off-by Axel Lin <[email protected]>
--- arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c | 4 ++-- arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c | 4 ++-- arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/p1010_serdes.c | 4 ++-- arch/powerpc/cpu/mpc85xx/p1021_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/p1022_serdes.c | 4 ++-- arch/powerpc/cpu/mpc85xx/p1023_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/p2020_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/p2041_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/p3041_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/p4080_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/p5020_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/p5040_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/t1040_serdes.c | 2 +- arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c | 4 ++-- arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c | 4 ++-- 19 files changed, 25 insertions(+), 25 deletions(-)
arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c +2 -2
@@ -228,7 +228,7 @@ void fsl_serdes_init(void)break ; } -if (srds1_io_sel >ARRAY_SIZE (serdes1_cfg_tbl)) { +if (srds1_io_sel >=ARRAY_SIZE (serdes1_cfg_tbl)) {printf ("Invalid PORDEVSR[SRDS1_IO_SEL] = %d\n" , srds1_io_sel);return ; }
@@ -237,7 +237,7 @@ void fsl_serdes_init(void) serdes1_prtcl_map |= (1 << lane_prtcl); } -if (srds2_io_sel >ARRAY_SIZE (serdes2_cfg_tbl)) { +if (srds2_io_sel >=ARRAY_SIZE (serdes2_cfg_tbl)) {printf ("Invalid PORDEVSR[SRDS2_IO_SEL] = %d\n" , srds2_io_sel);return ; }
arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c +2 -2
@@ -68,7 +68,7 @@ void fsl_serdes_init(void)debug ("PORDEVSR[IO_SEL_SRDS] = %x\n" , srds_cfg); -if (srds_cfg >ARRAY_SIZE (serdes1_cfg_tbl)) { +if (srds_cfg >=ARRAY_SIZE (serdes1_cfg_tbl)) {printf ("Invalid PORDEVSR[IO_SEL_SRDS] = %d\n" , srds_cfg);return ; }
@@ -77,7 +77,7 @@ void fsl_serdes_init(void) serdes1_prtcl_map |= (1 << lane_prtcl); } -if (srds_cfg >ARRAY_SIZE (serdes2_cfg_tbl)) { +if (srds_cfg >=ARRAY_SIZE (serdes2_cfg_tbl)) {printf ("Invalid PORDEVSR[IO_SEL_SRDS] = %d\n" , srds_cfg);return ; }
arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c +1 -1
@@ -53,7 +53,7 @@ void fsl_serdes_init(void)debug ("PORDEVSR[IO_SEL] = %x\n" , srds1_cfg); -if (srds1_cfg >ARRAY_SIZE (serdes1_cfg_tbl)) { +if (srds1_cfg >=ARRAY_SIZE (serdes1_cfg_tbl)) {printf ("Invalid PORDEVSR[IO_SEL] = %d\n" , srds1_cfg);return ; }
arch/powerpc/cpu/mpc85xx/mpc8568_serdes.c +1 -1
@@ -53,7 +53,7 @@ void fsl_serdes_init(void)debug ("PORDEVSR[IO_SEL_SRDS] = %x\n" , srds_cfg); -if (srds_cfg >ARRAY_SIZE (serdes1_cfg_tbl)) { +if (srds_cfg >=ARRAY_SIZE (serdes1_cfg_tbl)) {printf ("Invalid PORDEVSR[IO_SEL_SRDS] = %d\n" , srds_cfg);return ; }
arch/powerpc/cpu/mpc85xx/mpc8569_serdes.c +1 -1
@@ -62,7 +62,7 @@ void fsl_serdes_init(void)debug ("PORDEVSR[IO_SEL_SRDS] = %x\n" , srds_cfg); -if (srds_cfg >ARRAY_SIZE (serdes1_cfg_tbl)) { +if (srds_cfg >=ARRAY_SIZE (serdes1_cfg_tbl)) {printf ("Invalid PORDEVSR[IO_SEL_SRDS] = %d\n" , srds_cfg);return ; }
arch/powerpc/cpu/mpc85xx/mpc8572_serdes.c +1 -1
@@ -57,7 +57,7 @@ void fsl_serdes_init(void)debug ("PORDEVSR[IO_SEL_SRDS] = %x\n" , srds_cfg); -if (srds_cfg >ARRAY_SIZE (serdes1_cfg_tbl)) { +if (srds_cfg >=ARRAY_SIZE (serdes1_cfg_tbl)) {printf ("Invalid PORDEVSR[IO_SEL_SRDS] = %d\n" , srds_cfg);return ; }
arch/powerpc/cpu/mpc85xx/p1010_serdes.c +2 -2
@@ -54,7 +54,7 @@ void fsl_serdes_init(void)debug ("PORDEVSR[IO_SEL_SRDS] = %x\n" , srds_cfg); -if (srds_cfg >ARRAY_SIZE (serdes1_cfg_tbl)) { +if (srds_cfg >=ARRAY_SIZE (serdes1_cfg_tbl)) {printf ("Invalid PORDEVSR[IO_SEL_SRDS] = %d\n" , srds_cfg);return ; }
@@ -63,7 +63,7 @@ void fsl_serdes_init(void) serdes1_prtcl_map |= (1 << lane_prtcl); } -if (srds_cfg >ARRAY_SIZE (serdes2_cfg_tbl)) { +if (srds_cfg >=ARRAY_SIZE (serdes2_cfg_tbl)) {printf ("Invalid PORDEVSR[IO_SEL_SRDS] = %d\n" , srds_cfg);return ; }
arch/powerpc/cpu/mpc85xx/p1021_serdes.c +1 -1
@@ -73,7 +73,7 @@ void fsl_serdes_init(void)debug ("PORDEVSR[IO_SEL_SRDS] = %x\n" , srds_cfg); -if (srds_cfg >ARRAY_SIZE (serdes1_cfg_tbl)) { +if (srds_cfg >=ARRAY_SIZE (serdes1_cfg_tbl)) {printf ("Invalid PORDEVSR[IO_SEL_SRDS] = %d\n" , srds_cfg);return ; }
arch/powerpc/cpu/mpc85xx/p1022_serdes.c +2 -2
@@ -93,7 +93,7 @@ void fsl_serdes_init(void)debug ("PORDEVSR[IO_SEL_SRDS] = %x\n" , srds_cfg); -if (srds_cfg >ARRAY_SIZE (serdes1_cfg_tbl)) { +if (srds_cfg >=ARRAY_SIZE (serdes1_cfg_tbl)) {printf ("Invalid PORDEVSR[IO_SEL_SRDS] = %d\n" , srds_cfg);return ; }
@@ -102,7 +102,7 @@ void fsl_serdes_init(void) serdes1_prtcl_map |= (1 << lane_prtcl); } -if (srds_cfg >ARRAY_SIZE (serdes2_cfg_tbl)) { +if (srds_cfg >=ARRAY_SIZE (serdes2_cfg_tbl)) {printf ("Invalid PORDEVSR[IO_SEL_SRDS] = %d\n" , srds_cfg);return ; }
arch/powerpc/cpu/mpc85xx/p1023_serdes.c +1 -1
@@ -41,7 +41,7 @@ void fsl_serdes_init(void)debug ("PORDEVSR[IO_SEL_SRDS] = %x\n" , srds_cfg); -if (srds_cfg >ARRAY_SIZE (serdes1_cfg_tbl)) { +if (srds_cfg >=ARRAY_SIZE (serdes1_cfg_tbl)) {printf ("Invalid PORDEVSR[IO_SEL_SRDS] = %d\n" , srds_cfg);return ; }
arch/powerpc/cpu/mpc85xx/p2020_serdes.c +1 -1
@@ -61,7 +61,7 @@ void fsl_serdes_init(void)debug ("PORDEVSR[IO_SEL_SRDS] = %x\n" , srds_cfg); -if (srds_cfg >ARRAY_SIZE (serdes1_cfg_tbl)) { +if (srds_cfg >=ARRAY_SIZE (serdes1_cfg_tbl)) {printf ("Invalid PORDEVSR[IO_SEL_SRDS] = %d\n" , srds_cfg);return ; }
arch/powerpc/cpu/mpc85xx/p2041_serdes.c +1 -1
@@ -90,7 +90,7 @@ int is_serdes_prtcl_valid(u32 prtcl)u32 svr =get_svr ();u32 ver =SVR_SOC_VER (svr); -if (prtcl >ARRAY_SIZE (serdes_cfg_tbl)) +if (prtcl >=ARRAY_SIZE (serdes_cfg_tbl))return 0 ;/* P2040[e] does not support XAUI */
arch/powerpc/cpu/mpc85xx/p3041_serdes.c +1 -1
@@ -139,7 +139,7 @@ enum srds_prtcl serdes_get_prtcl(int cfg, int lane)int is_serdes_prtcl_valid (u32 prtcl) {int i; -if (prtcl >ARRAY_SIZE (serdes_cfg_tbl)) +if (prtcl >=ARRAY_SIZE (serdes_cfg_tbl))return 0 ;for (i =0 ; i <SRDS_MAX_LANES ; i++) {
arch/powerpc/cpu/mpc85xx/p4080_serdes.c +1 -1
@@ -86,7 +86,7 @@ enum srds_prtcl serdes_get_prtcl(int cfg, int lane)int is_serdes_prtcl_valid (u32 prtcl) {int i; -if (prtcl >ARRAY_SIZE (serdes_cfg_tbl)) +if (prtcl >=ARRAY_SIZE (serdes_cfg_tbl))return 0 ;for (i =0 ; i <SRDS_MAX_LANES ; i++) {
arch/powerpc/cpu/mpc85xx/p5020_serdes.c +1 -1
@@ -139,7 +139,7 @@ enum srds_prtcl serdes_get_prtcl(int cfg, int lane)int is_serdes_prtcl_valid (u32 prtcl) {int i; -if (prtcl >ARRAY_SIZE (serdes_cfg_tbl)) +if (prtcl >=ARRAY_SIZE (serdes_cfg_tbl))return 0 ;for (i =0 ; i <SRDS_MAX_LANES ; i++) {
arch/powerpc/cpu/mpc85xx/p5040_serdes.c +1 -1
@@ -105,7 +105,7 @@ int is_serdes_prtcl_valid(u32 prtcl) {int i; -if (prtcl >ARRAY_SIZE (serdes_cfg_tbl)) +if (prtcl >=ARRAY_SIZE (serdes_cfg_tbl))return 0 ;for (i =0 ; i <SRDS_MAX_LANES ; i++) {
arch/powerpc/cpu/mpc85xx/t1040_serdes.c +1 -1
@@ -81,7 +81,7 @@ int is_serdes_prtcl_valid(int serdes, u32 prtcl) {int i; -if (prtcl > (ARRAY_SIZE (serdes_cfg_tbl[serdes]))) +if (prtcl >=ARRAY_SIZE (serdes_cfg_tbl[serdes]))return 0 ;for (i =0 ; i <SRDS_MAX_LANES ; i++) {
arch/powerpc/cpu/mpc86xx/mpc8610_serdes.c +2 -2
@@ -64,7 +64,7 @@ void fsl_serdes_init(void)debug ("PORDEVSR[IO_SEL_SRDS] = %x\n" , srds_cfg); -if (srds_cfg >ARRAY_SIZE (serdes1_cfg_tbl)) { +if (srds_cfg >=ARRAY_SIZE (serdes1_cfg_tbl)) {printf ("Invalid PORDEVSR[IO_SEL_SRDS] = %d\n" , srds_cfg);return ; }
@@ -73,7 +73,7 @@ void fsl_serdes_init(void) serdes1_prtcl_map |= (1 << lane_prtcl); } -if (srds_cfg >ARRAY_SIZE (serdes2_cfg_tbl)) { +if (srds_cfg >=ARRAY_SIZE (serdes2_cfg_tbl)) {printf ("Invalid PORDEVSR[IO_SEL_SRDS] = %d\n" , srds_cfg);return ; }
arch/powerpc/cpu/mpc86xx/mpc8641_serdes.c +2 -2
@@ -73,7 +73,7 @@ void fsl_serdes_init(void)debug ("PORDEVSR[IO_SEL_SRDS] = %x\n" , srds_cfg); -if (srds_cfg >ARRAY_SIZE (serdes1_cfg_tbl)) { +if (srds_cfg >=ARRAY_SIZE (serdes1_cfg_tbl)) {printf ("Invalid PORDEVSR[IO_SEL_SRDS] = %d\n" , srds_cfg);return ; }
@@ -82,7 +82,7 @@ void fsl_serdes_init(void) serdes1_prtcl_map |= (1 << lane_prtcl); } -if (srds_cfg >ARRAY_SIZE (serdes2_cfg_tbl)) { +if (srds_cfg >=ARRAY_SIZE (serdes2_cfg_tbl)) {printf ("Invalid PORDEVSR[IO_SEL_SRDS] = %d\n" , srds_cfg);return ; }
Signature · 1 line
1.8.1.2
Andy Fleming
AppliedQuoted 4 lines · Axel Lin
If a variable is used as array subscript, it's valid value range is 0 ...
ARRAY_SIZE-1.Signed-off-by Axel Lin <[email protected]>
Applied, thanks!
Andy