diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-09-27 13:09:28 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-09-27 13:09:28 -0700 |
| commit | 9c908f97d0f9aee32fa6d4b0a44c4c5d0ccab2b0 (patch) | |
| tree | 4c863da394fd58a51cdbc4c0386560fe994ee262 | |
| parent | ff0ce6845bc18292e80ea40d11c3d3a539a3fc5e (diff) | |
| download | blackbird-op-linux-9c908f97d0f9aee32fa6d4b0a44c4c5d0ccab2b0.tar.gz blackbird-op-linux-9c908f97d0f9aee32fa6d4b0a44c4c5d0ccab2b0.zip | |
[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: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | arch/sparc/kernel/ebus.c | 2 | ||||
| -rw-r--r-- | arch/sparc64/kernel/ebus.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/sparc/kernel/ebus.c b/arch/sparc/kernel/ebus.c index e2d02fd13f35..d850785b2080 100644 --- a/arch/sparc/kernel/ebus.c +++ b/arch/sparc/kernel/ebus.c @@ -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, diff --git a/arch/sparc64/kernel/ebus.c b/arch/sparc64/kernel/ebus.c index bc9ae36f7a43..04ab81cb4f48 100644 --- a/arch/sparc64/kernel/ebus.c +++ b/arch/sparc64/kernel/ebus.c @@ -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++) |
