From: Ben Collins This was causing me all sorts of problems with linux1394's 16-18 byte long bus_id lengths. The sysfs names were all broken. This not only makes KOBJ_NAME_LEN match BUS_ID_SIZE, but fixes the strncpy's in drivers/base/ so that it can't happen again (at least the strings will be null terminated). drivers/base/bus.c | 2 ++ drivers/base/class.c | 2 ++ drivers/base/core.c | 1 + include/linux/kobject.h | 2 +- 4 files changed, 6 insertions(+), 1 deletion(-) diff -puN drivers/base/bus.c~make-KOBJ_NAME-match-BUS_ID_SIZE drivers/base/bus.c --- 25/drivers/base/bus.c~make-KOBJ_NAME-match-BUS_ID_SIZE 2003-05-13 01:05:51.000000000 -0700 +++ 25-akpm/drivers/base/bus.c 2003-05-13 01:05:51.000000000 -0700 @@ -432,6 +432,7 @@ int bus_add_driver(struct device_driver pr_debug("bus %s: add driver %s\n",bus->name,drv->name); strncpy(drv->kobj.name,drv->name,KOBJ_NAME_LEN); + drv->kobj.name[KOBJ_NAME_LEN-1] = '\0'; drv->kobj.kset = &bus->drivers; if ((error = kobject_register(&drv->kobj))) { @@ -541,6 +542,7 @@ struct bus_type * find_bus(char * name) int bus_register(struct bus_type * bus) { strncpy(bus->subsys.kset.kobj.name,bus->name,KOBJ_NAME_LEN); + bus->subsys.kset.kobj.name[KOBJ_NAME_LEN-1] = '\0'; subsys_set_kset(bus,bus_subsys); subsystem_register(&bus->subsys); diff -puN drivers/base/class.c~make-KOBJ_NAME-match-BUS_ID_SIZE drivers/base/class.c --- 25/drivers/base/class.c~make-KOBJ_NAME-match-BUS_ID_SIZE 2003-05-13 01:05:51.000000000 -0700 +++ 25-akpm/drivers/base/class.c 2003-05-13 01:05:51.000000000 -0700 @@ -89,6 +89,7 @@ int class_register(struct class * cls) INIT_LIST_HEAD(&cls->interfaces); strncpy(cls->subsys.kset.kobj.name,cls->name,KOBJ_NAME_LEN); + cls->subsys.kset.kobj.name[KOBJ_NAME_LEN-1] = '\0'; subsys_set_kset(cls,class_subsys); subsystem_register(&cls->subsys); @@ -259,6 +260,7 @@ int class_device_add(struct class_device /* first, register with generic layer. */ strncpy(class_dev->kobj.name, class_dev->class_id, KOBJ_NAME_LEN); + class_dev->kobj.name[KOBJ_NAME_LEN-1] = '\0'; kobj_set_kset_s(class_dev, class_obj_subsys); if (parent) class_dev->kobj.parent = &parent->subsys.kset.kobj; diff -puN drivers/base/core.c~make-KOBJ_NAME-match-BUS_ID_SIZE drivers/base/core.c --- 25/drivers/base/core.c~make-KOBJ_NAME-match-BUS_ID_SIZE 2003-05-13 01:05:51.000000000 -0700 +++ 25-akpm/drivers/base/core.c 2003-05-13 01:05:51.000000000 -0700 @@ -214,6 +214,7 @@ int device_add(struct device *dev) /* first, register with generic layer. */ strncpy(dev->kobj.name,dev->bus_id,KOBJ_NAME_LEN); + dev->kobj.name[KOBJ_NAME_LEN-1] = '\0'; kobj_set_kset_s(dev,devices_subsys); if (parent) dev->kobj.parent = &parent->kobj; diff -puN include/linux/kobject.h~make-KOBJ_NAME-match-BUS_ID_SIZE include/linux/kobject.h --- 25/include/linux/kobject.h~make-KOBJ_NAME-match-BUS_ID_SIZE 2003-05-13 01:05:51.000000000 -0700 +++ 25-akpm/include/linux/kobject.h 2003-05-13 01:05:51.000000000 -0700 @@ -12,7 +12,7 @@ #include #include -#define KOBJ_NAME_LEN 16 +#define KOBJ_NAME_LEN 20 struct kobject { char name[KOBJ_NAME_LEN]; _