From: Ben Collins <bcollins@debian.org>
To: Patrick Mochel <mochel@osdl.org>
Cc: Linus Torvalds <torvalds@transmeta.com>, linux-kernel@vger.kernel.org
Subject: Re: Resend [PATCH] Make KOBJ_NAME_LEN match BUS_ID_SIZE
Date: Sat, 24 May 2003 20:07:01 -0400 [thread overview]
Message-ID: <20030525000701.GG504@phunnypharm.org> (raw)
In-Reply-To: <20030516002059.GE433@phunnypharm.org>
Given that the problem with KOBJ_NAME_LEN == 20 affecting one snd driver
has so far only been explained as a compiler bug, can I suggest this
patch be applied? Even aside from the KOBJ_NAME_LEN == 20, the snprintf
changes will keep things from breaking in other ways that are current
now.
Index: include/linux/kobject.h
===================================================================
--- include/linux/kobject.h (revision 10014)
+++ include/linux/kobject.h (working copy)
@@ -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/class.c
===================================================================
--- drivers/base/class.c (revision 10014)
+++ drivers/base/class.c (working copy)
@@ -87,8 +87,9 @@
INIT_LIST_HEAD(&cls->children);
INIT_LIST_HEAD(&cls->interfaces);
-
- strncpy(cls->subsys.kset.kobj.name,cls->name,KOBJ_NAME_LEN);
+
+ snprintf(cls->subsys.kset.kobj.name, KOBJ_NAME_LEN, "%s",
+ cls->name);
subsys_set_kset(cls,class_subsys);
subsystem_register(&cls->subsys);
@@ -258,7 +259,7 @@
class_dev->class_id);
/* first, register with generic layer. */
- strncpy(class_dev->kobj.name, class_dev->class_id, KOBJ_NAME_LEN);
+ snprintf(class_dev->kobj.name, KOBJ_NAME_LEN, "%s", class_dev->class_id);
kobj_set_kset_s(class_dev, class_obj_subsys);
if (parent)
class_dev->kobj.parent = &parent->subsys.kset.kobj;
Index: drivers/base/core.c
===================================================================
--- drivers/base/core.c (revision 10014)
+++ drivers/base/core.c (working copy)
@@ -211,7 +211,7 @@
dev->bus_id, dev->name);
/* first, register with generic layer. */
- strncpy(dev->kobj.name,dev->bus_id,KOBJ_NAME_LEN);
+ snprintf(dev->kobj.name, KOBJ_NAME_LEN, "%s", dev->bus_id);
if (parent)
dev->kobj.parent = &parent->kobj;
Index: drivers/base/bus.c
===================================================================
--- drivers/base/bus.c (revision 10014)
+++ drivers/base/bus.c (working copy)
@@ -431,7 +431,7 @@
if (bus) {
pr_debug("bus %s: add driver %s\n",bus->name,drv->name);
- strncpy(drv->kobj.name,drv->name,KOBJ_NAME_LEN);
+ snprintf(drv->kobj.name, KOBJ_NAME_LEN, "%s", drv->name);
drv->kobj.kset = &bus->drivers;
if ((error = kobject_register(&drv->kobj))) {
@@ -540,7 +540,8 @@
*/
int bus_register(struct bus_type * bus)
{
- strncpy(bus->subsys.kset.kobj.name,bus->name,KOBJ_NAME_LEN);
+ snprintf(bus->subsys.kset.kobj.name, KOBJ_NAME_LEN, "%s",
+ bus->name);
subsys_set_kset(bus,bus_subsys);
subsystem_register(&bus->subsys);
next prev parent reply other threads:[~2003-05-25 0:41 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 ` Resend " Ben Collins
2003-05-16 18:43 ` Felipe Alfaro Solana
2003-05-25 0:07 ` Ben Collins [this message]
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=20030525000701.GG504@phunnypharm.org \
--to=bcollins@debian.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).