Commit bb579cf1 authored by Eric Sesterhenn's avatar Eric Sesterhenn Committed by Paul Mackerras

[POWERPC] Off-by-one in /arch/ppc/platforms/mpc8*

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: default avatarEric Sesterhenn <snakebyte@gmx.de>
Cc: Vitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent ee4ea82c
...@@ -196,7 +196,7 @@ static void __init mpc8272ads_fixup_enet_pdata(struct platform_device *pdev, ...@@ -196,7 +196,7 @@ static void __init mpc8272ads_fixup_enet_pdata(struct platform_device *pdev,
bd_t* bi = (void*)__res; bd_t* bi = (void*)__res;
int fs_no = fsid_fcc1+pdev->id-1; 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; return;
} }
...@@ -222,7 +222,7 @@ static void mpc8272ads_fixup_uart_pdata(struct platform_device *pdev, ...@@ -222,7 +222,7 @@ static void mpc8272ads_fixup_uart_pdata(struct platform_device *pdev,
int id = fs_uart_id_scc2fsid(idx); int id = fs_uart_id_scc2fsid(idx);
/* no need to alter anything if console */ /* 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 = &mpc8272_uart_pdata[id];
pinfo->uart_clk = bd->bi_intfreq; pinfo->uart_clk = bd->bi_intfreq;
pdev->dev.platform_data = pinfo; pdev->dev.platform_data = pinfo;
......
...@@ -259,7 +259,7 @@ static void mpc866ads_fixup_enet_pdata(struct platform_device *pdev, int fs_no) ...@@ -259,7 +259,7 @@ static void mpc866ads_fixup_enet_pdata(struct platform_device *pdev, int fs_no)
/* Get pointer to Communication Processor */ /* Get pointer to Communication Processor */
cp = cpmp; 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); printk(KERN_ERR"No network-suitable #%d device on bus", fs_no);
return; return;
} }
...@@ -305,7 +305,7 @@ static void __init mpc866ads_fixup_uart_pdata(struct platform_device *pdev, ...@@ -305,7 +305,7 @@ static void __init mpc866ads_fixup_uart_pdata(struct platform_device *pdev,
int id = fs_uart_id_smc2fsid(idx); int id = fs_uart_id_smc2fsid(idx);
/* no need to alter anything if console */ /* 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 = &mpc866_uart_pdata[id];
pinfo->uart_clk = bd->bi_intfreq; pinfo->uart_clk = bd->bi_intfreq;
pdev->dev.platform_data = pinfo; pdev->dev.platform_data = pinfo;
......
...@@ -263,7 +263,7 @@ static void mpc885ads_fixup_enet_pdata(struct platform_device *pdev, int fs_no) ...@@ -263,7 +263,7 @@ static void mpc885ads_fixup_enet_pdata(struct platform_device *pdev, int fs_no)
char *e; char *e;
int i; 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); printk(KERN_ERR"No network-suitable #%d device on bus", fs_no);
return; return;
} }
...@@ -371,7 +371,7 @@ static void __init mpc885ads_fixup_uart_pdata(struct platform_device *pdev, ...@@ -371,7 +371,7 @@ static void __init mpc885ads_fixup_uart_pdata(struct platform_device *pdev,
int id = fs_uart_id_smc2fsid(idx); int id = fs_uart_id_smc2fsid(idx);
/* no need to alter anything if console */ /* 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 = &mpc885_uart_pdata[id];
pinfo->uart_clk = bd->bi_intfreq; pinfo->uart_clk = bd->bi_intfreq;
pdev->dev.platform_data = pinfo; pdev->dev.platform_data = pinfo;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment