hi,
a find -iname \*.[ch] | xargs grep "> ARRAY_SIZE(" revealed
several incorrect usages of ARRAY_SIZE in the mpc drivers.
The last element in the array is always ARRAY_SIZE()-1,
this patch modifies the bounds checks accordingly.
Signed-off-by: Eric Sesterhenn <[email protected]>
--- linux-2.6.18-git5/arch/ppc/platforms/mpc8272ads_setup.c.orig 2006-09-26 14:24:56.000000000 +0200
+++ linux-2.6.18-git5/arch/ppc/platforms/mpc8272ads_setup.c 2006-09-26 14:25:12.000000000 +0200
@@ -196,7 +196,7 @@ static void __init mpc8272ads_fixup_enet
bd_t* bi = (void*)__res;
int fs_no = fsid_fcc1+pdev->id-1;
- if(fs_no > ARRAY_SIZE(mpc82xx_enet_pdata)) {
+ if(fs_no >= ARRAY_SIZE(mpc82xx_enet_pdata)) {
return;
}
@@ -222,7 +222,7 @@ static void mpc8272ads_fixup_uart_pdata(
int id = fs_uart_id_scc2fsid(idx);
/* no need to alter anything if console */
- if ((id <= num) && (!pdev->dev.platform_data)) {
+ if ((id < num) && (!pdev->dev.platform_data)) {
pinfo = &mpc8272_uart_pdata[id];
pinfo->uart_clk = bd->bi_intfreq;
pdev->dev.platform_data = pinfo;
--- linux-2.6.18-git5/arch/ppc/platforms/mpc866ads_setup.c.orig 2006-09-26 14:23:08.000000000 +0200
+++ linux-2.6.18-git5/arch/ppc/platforms/mpc866ads_setup.c 2006-09-26 14:23:48.000000000 +0200
@@ -259,7 +259,7 @@ static void mpc866ads_fixup_enet_pdata(s
/* Get pointer to Communication Processor */
cp = cpmp;
- if(fs_no > ARRAY_SIZE(mpc8xx_enet_pdata)) {
+ if(fs_no >= ARRAY_SIZE(mpc8xx_enet_pdata)) {
printk(KERN_ERR"No network-suitable #%d device on bus", fs_no);
return;
}
@@ -305,7 +305,7 @@ static void __init mpc866ads_fixup_uart_
int id = fs_uart_id_smc2fsid(idx);
/* no need to alter anything if console */
- if ((id <= num) && (!pdev->dev.platform_data)) {
+ if ((id < num) && (!pdev->dev.platform_data)) {
pinfo = &mpc866_uart_pdata[id];
pinfo->uart_clk = bd->bi_intfreq;
pdev->dev.platform_data = pinfo;
--- linux-2.6.18-git5/arch/ppc/platforms/mpc885ads_setup.c.orig 2006-09-26 14:24:03.000000000 +0200
+++ linux-2.6.18-git5/arch/ppc/platforms/mpc885ads_setup.c 2006-09-26 14:24:31.000000000 +0200
@@ -263,7 +263,7 @@ static void mpc885ads_fixup_enet_pdata(s
char *e;
int i;
- if(fs_no > ARRAY_SIZE(mpc8xx_enet_pdata)) {
+ if(fs_no >= ARRAY_SIZE(mpc8xx_enet_pdata)) {
printk(KERN_ERR"No network-suitable #%d device on bus", fs_no);
return;
}
@@ -371,7 +371,7 @@ static void __init mpc885ads_fixup_uart_
int id = fs_uart_id_smc2fsid(idx);
/* no need to alter anything if console */
- if ((id <= num) && (!pdev->dev.platform_data)) {
+ if ((id < num) && (!pdev->dev.platform_data)) {
pinfo = &mpc885_uart_pdata[id];
pinfo->uart_clk = bd->bi_intfreq;
pdev->dev.platform_data = pinfo;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
