From: Ben Collins <bcollins@debian.org>
To: Patrick Mochel <mochel@osdl.org>
Cc: Christoph Hellwig <hch@infradead.org>,
Linus Torvalds <torvalds@transmeta.com>,
linux-kernel@vger.kernel.org
Subject: Resend [PATCH] Make KOBJ_NAME_LEN match BUS_ID_SIZE
Date: Thu, 15 May 2003 20:20:59 -0400 [thread overview]
Message-ID: <20030516002059.GE433@phunnypharm.org> (raw)
In-Reply-To: <Pine.LNX.4.44.0305130808040.9816-100000@cherise>
On Tue, May 13, 2003 at 08:08:35AM -0700, Patrick Mochel wrote:
>
> On Tue, 13 May 2003, Ben Collins wrote:
>
> > On Tue, May 13, 2003 at 08:10:32AM +0100, Christoph Hellwig wrote:
> > > On Tue, May 13, 2003 at 02:26:40AM -0400, Ben Collins wrote:
> > > > 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 (atleast the
> > > > strings will be null terminated).
> > >
> > > What about defining BUS_ID_SIZE in terms of KOBJ_NAME_LEN?
> >
> > Ok, then add this in addition to the previous patch.
>
> I'll add this, and sync with Linus this week, if he doesn't pick it up.
*sigh* Patrick, you accepted the BUS_ID_SIZE change without the original
patch, so now BUS_ID_SIZE is back to 16 bytes.
Linus, please apply this patch to get things right again.
-------
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 (atleast the
strings will be null terminated).
Index: include/linux/kobject.h
===================================================================
RCS file: /home/scm/linux-2.5/include/linux/kobject.h,v
retrieving revision 1.11
diff -u -r1.11 kobject.h
--- include/linux/kobject.h 12 Apr 2003 01:04:46 -0000 1.11
+++ include/linux/kobject.h 13 May 2003 06:56:30 -0000
@@ -12,7 +12,7 @@
#include <linux/rwsem.h>
#include <asm/atomic.h>
-#define KOBJ_NAME_LEN 16
+#define KOBJ_NAME_LEN 20
struct kobject {
char name[KOBJ_NAME_LEN];
Index: drivers/base/bus.c
===================================================================
RCS file: /home/scm/linux-2.5/drivers/base/bus.c,v
retrieving revision 1.24
diff -u -r1.24 bus.c
--- drivers/base/bus.c 29 Apr 2003 17:30:20 -0000 1.24
+++ drivers/base/bus.c 13 May 2003 06:56:30 -0000
@@ -432,6 +432,7 @@
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 @@
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);
Index: drivers/base/class.c
===================================================================
RCS file: /home/scm/linux-2.5/drivers/base/class.c,v
retrieving revision 1.18
diff -u -r1.18 class.c
--- drivers/base/class.c 11 May 2003 05:00:57 -0000 1.18
+++ drivers/base/class.c 13 May 2003 06:56:30 -0000
@@ -89,6 +89,7 @@
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 @@
/* 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;
Index: drivers/base/core.c
===================================================================
RCS file: /home/scm/linux-2.5/drivers/base/core.c,v
retrieving revision 1.43
diff -u -r1.43 core.c
--- drivers/base/core.c 29 Apr 2003 17:30:20 -0000 1.43
+++ drivers/base/core.c 13 May 2003 06:56:30 -0000
@@ -214,6 +214,7 @@
/* 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;
next prev parent reply other threads:[~2003-05-16 0:46 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-05-13 6:26 [PATCH] Make KOBJ_NAME_LEN match BUS_ID_SIZE Ben Collins
2003-05-13 7:10 ` Christoph Hellwig
2003-05-13 7:14 ` Ben Collins
2003-05-13 15:08 ` Patrick Mochel
2003-05-16 0:20 ` Ben Collins [this message]
2003-05-16 18:43 ` Resend " Felipe Alfaro Solana
2003-05-25 0:07 ` Ben Collins
2003-05-25 3:52 ` Linus Torvalds
2003-05-25 3:10 ` Ben Collins
2003-05-25 12:03 ` Adam Sampson
2003-05-25 17:10 ` Linus Torvalds
2003-05-25 16:40 ` Ben Collins
2003-05-25 15:51 ` Matt Mackall
2003-05-25 17:25 ` Riley Williams
2003-05-25 18:13 ` Valdis.Kletnieks
2003-05-25 23:42 ` Matt Mackall
2003-05-25 16:41 ` Ben Collins
2003-07-11 9:50 ` Rogier Wolff
2003-05-25 8:02 ` Russell King
2003-05-25 9:21 René Scharfe
2003-05-25 12:05 ` Christoph Hellwig
2003-05-25 17:24 ` Edgar Toernig
2003-05-25 19:05 ` René Scharfe
2003-05-25 18:16 ` Ben Collins
2003-05-25 20:11 ` René Scharfe
2003-05-25 19:01 ` Valdis.Kletnieks
2003-05-25 19:31 ` René Scharfe
2003-05-26 1:13 ` Linus Torvalds
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20030516002059.GE433@phunnypharm.org \
--to=bcollins@debian.org \
--cc=hch@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mochel@osdl.org \
--cc=torvalds@transmeta.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).