[SPARC]: Fix bus_id[] string overflow.

dp->path_component_name can be larger than ->bus_id[]
so use a different naming scheme for this stuff.

Noticed by Jurij Smakov.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/sparc64/kernel/isa.c b/arch/sparc64/kernel/isa.c
index 0f3aec72ef5f..f028e68b23f2 100644
--- a/arch/sparc64/kernel/isa.c
+++ b/arch/sparc64/kernel/isa.c
@@ -115,12 +115,12 @@ static void __init isa_fill_devices(struct sparc_isa_bridge *isa_br)
                 isa_dev->ofdev.node = dp;
                 isa_dev->ofdev.dev.parent = &isa_br->ofdev.dev;
                 isa_dev->ofdev.dev.bus = &isa_bus_type;
-                strcpy(isa_dev->ofdev.dev.bus_id, dp->path_component_name);
+                sprintf(isa_dev->ofdev.dev.bus_id, "isa[%08x]", dp->node);
 
                 /* Register with core */
                 if (of_device_register(&isa_dev->ofdev) != 0) {
                         printk(KERN_DEBUG "isa: device registration error for %s!\n",
-                               isa_dev->ofdev.dev.bus_id);
+                               dp->path_component_name);
                         kfree(isa_dev);
                         goto next_sibling;
                 }
@@ -191,12 +191,12 @@ void __init isa_init(void)
                 isa_br->ofdev.node = dp;
                 isa_br->ofdev.dev.parent = &pdev->dev;
                 isa_br->ofdev.dev.bus = &isa_bus_type;
-                strcpy(isa_br->ofdev.dev.bus_id, dp->path_component_name);
+                sprintf(isa_br->ofdev.dev.bus_id, "isa%d", index);
 
                 /* Register with core */
                 if (of_device_register(&isa_br->ofdev) != 0) {
                         printk(KERN_DEBUG "isa: device registration error for %s!\n",
-                               isa_br->ofdev.dev.bus_id);
+                               dp->path_component_name);
                         kfree(isa_br);
                         return;
                 }