Patchwork fix array overrun check in of_device_64.c

login
register
mail settings
Submitter Robert Reif
Date Dec. 23, 2008, 1:11 a.m.
Message ID <49503AA7.0@earthlink.net>
Download mbox | patch
Permalink /patch/15408/
State Accepted
Delegated to: David Miller
Headers show

Comments

Robert Reif - Dec. 23, 2008, 1:11 a.m.
Do the array length check and fixup before copying the array.

Signed-off-by: Robert Reif <reif@earthlink.net>
David Miller - Dec. 26, 2008, 11:39 p.m.
From: Robert Reif <reif@earthlink.net>
Date: Mon, 22 Dec 2008 20:11:03 -0500

> Do the array length check and fixup before copying the array.
> 
> Signed-off-by: Robert Reif <reif@earthlink.net>

Good catch!  Applied, thanks Robert.
--
To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/sparc/kernel/of_device_64.c b/arch/sparc/kernel/of_device_64.c
index 0f616ae..46e231f 100644
--- a/arch/sparc/kernel/of_device_64.c
+++ b/arch/sparc/kernel/of_device_64.c
@@ -811,20 +811,20 @@  static struct of_device * __init scan_one_device(struct device_node *dp,
 
 	irq = of_get_property(dp, "interrupts", &len);
 	if (irq) {
-		memcpy(op->irqs, irq, len);
 		op->num_irqs = len / 4;
+
+		/* Prevent overrunning the op->irqs[] array.  */
+		if (op->num_irqs > PROMINTR_MAX) {
+			printk(KERN_WARNING "%s: Too many irqs (%d), "
+			       "limiting to %d.\n",
+			       dp->full_name, op->num_irqs, PROMINTR_MAX);
+			op->num_irqs = PROMINTR_MAX;
+		}
+		memcpy(op->irqs, irq, op->num_irqs * 4);
 	} else {
 		op->num_irqs = 0;
 	}
 
-	/* Prevent overrunning the op->irqs[] array.  */
-	if (op->num_irqs > PROMINTR_MAX) {
-		printk(KERN_WARNING "%s: Too many irqs (%d), "
-		       "limiting to %d.\n",
-		       dp->full_name, op->num_irqs, PROMINTR_MAX);
-		op->num_irqs = PROMINTR_MAX;
-	}
-
 	build_device_resources(op, parent);
 	for (i = 0; i < op->num_irqs; i++)
 		op->irqs[i] = build_one_device_irq(op, parent, op->irqs[i]);