Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92d9091f authored by Robert Reif's avatar Robert Reif Committed by David S. Miller
Browse files

sparc: fix array overrun check in of_device_64.c 



Do the array length check and fixup before copying the array.

Signed-off-by: default avatarRobert Reif <reif@earthlink.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e6b04fe0

arch/sparc/kernel/of_device_64.c

+9 −9
Original line number Original line Diff line number Diff line
@@ -811,11 +811,7 @@ static struct of_device * __init scan_one_device(struct device_node *dp, 




	irq = of_get_property(dp, "interrupts", &len);

	irq = of_get_property(dp, "interrupts", &len);

	if (irq) {

	if (irq) {

		memcpy(op->irqs, irq, len);

		op->num_irqs = len / 4;

		op->num_irqs = len / 4;

	} else {

		op->num_irqs = 0;

	}





		/* Prevent overrunning the op->irqs[] array.  */

		/* Prevent overrunning the op->irqs[] array.  */

		if (op->num_irqs > PROMINTR_MAX) {

		if (op->num_irqs > PROMINTR_MAX) {
@@ -824,6 +820,10 @@ static struct of_device * __init scan_one_device(struct device_node *dp, 
			       dp->full_name, op->num_irqs, PROMINTR_MAX);

			       dp->full_name, op->num_irqs, PROMINTR_MAX);

			op->num_irqs = PROMINTR_MAX;

			op->num_irqs = PROMINTR_MAX;

		}

		}

		memcpy(op->irqs, irq, op->num_irqs * 4);

	} else {

		op->num_irqs = 0;

	}





	build_device_resources(op, parent);

	build_device_resources(op, parent);

	for (i = 0; i < op->num_irqs; i++)

	for (i = 0; i < op->num_irqs; i++)