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

Commit 9c908f97 authored by David S. Miller's avatar David S. Miller
Browse files

[SPARC]: Fix EBUS use of uninitialized variable. 



If of_get_property() fails, it returns NULL and the 'len'
parameter is undefined.  So we need to explicitly set len
to zero in such cases.

Noticed by Al Viro.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ff0ce684

arch/sparc/kernel/ebus.c

+2 −0
Original line number Diff line number Diff line
@@ -156,6 +156,8 @@ void __init fill_ebus_device(struct device_node *dp, struct linux_ebus_device *d 
	dev->prom_node = dp;



	regs = of_get_property(dp, "reg", &len);

	if (!regs)

		len = 0;

	if (len % sizeof(struct linux_prom_registers)) {

		prom_printf("UGH: proplen for %s was %d, need multiple of %d\n",

			    dev->prom_node->name, len,

arch/sparc64/kernel/ebus.c

+4 −1
Original line number Diff line number Diff line
@@ -375,7 +375,10 @@ static void __init fill_ebus_device(struct device_node *dp, struct linux_ebus_de 
		dev->num_addrs = 0;

		dev->num_irqs = 0;

	} else {

		(void) of_get_property(dp, "reg", &len);

		const int *regs = of_get_property(dp, "reg", &len);



		if (!regs)

			len = 0;

		dev->num_addrs = len / sizeof(struct linux_prom_registers);



		for (i = 0; i < dev->num_addrs; i++)