[ARM] 5027/1: Fixed random memory corruption on pxa suspend cycle.

Each time a pxa type cpu went in suspend, a portion of
kmalloc memory was corrupted.
The issue was an incorrect length allocation introduced by
the commit 711be5ccfe9a02ba560aa918a008c31ea4760163 for
the save registers array (=> overflow).

Signed-off-by: Robert Jarzmik <rjarzmik@free.fr>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 4 insertions, 3 deletions

diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c
index ec1bbf333a3a..329df2152dcd 100644
--- a/arch/arm/mach-pxa/pm.c
+++ b/arch/arm/mach-pxa/pm.c
@@ -42,7 +42,7 @@ int pxa_pm_enter(suspend_state_t state)
         if (state != PM_SUSPEND_STANDBY) {
                 pxa_cpu_pm_fns->save(sleep_save);
                 /* before sleeping, calculate and save a checksum */
-                for (i = 0; i < pxa_cpu_pm_fns->save_size - 1; i++)
+                for (i = 0; i < pxa_cpu_pm_fns->save_count - 1; i++)
                         sleep_save_checksum += sleep_save[i];
         }
 
@@ -55,7 +55,7 @@ int pxa_pm_enter(suspend_state_t state)
 
         if (state != PM_SUSPEND_STANDBY) {
                 /* after sleeping, validate the checksum */
-                for (i = 0; i < pxa_cpu_pm_fns->save_size - 1; i++)
+                for (i = 0; i < pxa_cpu_pm_fns->save_count - 1; i++)
                         checksum += sleep_save[i];
 
                 /* if invalid, display message and wait for a hardware reset */
@@ -101,7 +101,8 @@ static int __init pxa_pm_init(void)
                 return -EINVAL;
         }
 
-        sleep_save = kmalloc(pxa_cpu_pm_fns->save_size, GFP_KERNEL);
+        sleep_save = kmalloc(pxa_cpu_pm_fns->save_count * sizeof(unsigned long),
+                             GFP_KERNEL);
         if (!sleep_save) {
                 printk(KERN_ERR "failed to alloc memory for pm save\n");
                 return -ENOMEM;