Message ID | 1271765898.4324.2.camel@concordia (mailing list archive) |
---|---|
State | Changes Requested |
Headers | show |
On Wed, 2010-04-21 at 18:55 +0300, Alexey Dobriyan wrote: > On Tue, Apr 20, 2010 at 10:18:18PM +1000, Michael Ellerman wrote: > > On Mon, 2010-04-19 at 23:45 -0700, Christian Kujau wrote: > > --- a/fs/proc/proc_devtree.c > > +++ b/fs/proc/proc_devtree.c > > @@ -175,6 +175,24 @@ retry: > > return fixed_name; > > } > > > > +static const char *unslash_name(const char *name) > > +{ > > + char *p, *fixed_name; > > + > > + fixed_name = kstrdup(name); > > + if (!fixed_name) { > > + printk(KERN_ERR "device-tree: Out of memory trying to unslash " > > + "name \"%s\"\n", name); > > + return name; > > + } > > + > > + p = fixed_name; > > + while ((p = strstr(p, "/"))) > > + *p++ = '_'; > > This is wasteful. :-) Whatever, patches welcome :) > Also, I hope we won't spit message every time allocation fail. We do. Your system is mostly hosed anyway, but feel free to rate limit it or something. The error handling in there is a bit dubious, if the alloc fails we just return the old name, which we know is bogus. It should probably return NULL and the calling code can check - same for fixup_name(). cheers
On Wednesday 21 April 2010, Michael Ellerman wrote: > On Wed, 2010-04-21 at 18:55 +0300, Alexey Dobriyan wrote: > > On Tue, Apr 20, 2010 at 10:18:18PM +1000, Michael Ellerman wrote: > > > On Mon, 2010-04-19 at 23:45 -0700, Christian Kujau wrote: > > > --- a/fs/proc/proc_devtree.c > > > +++ b/fs/proc/proc_devtree.c > > > @@ -175,6 +175,24 @@ retry: > > > return fixed_name; > > > } > > > > > > +static const char *unslash_name(const char *name) > > > +{ > > > + char *p, *fixed_name; > > > + > > > + fixed_name = kstrdup(name); > > > + if (!fixed_name) { > > > + printk(KERN_ERR "device-tree: Out of memory trying to unslash " > > > + "name \"%s\"\n", name); > > > + return name; > > > + } > > > + > > > + p = fixed_name; > > > + while ((p = strstr(p, "/"))) > > > + *p++ = '_'; > > > > This is wasteful. :-) > > Whatever, patches welcome :) > > > Also, I hope we won't spit message every time allocation fail. > > We do. Your system is mostly hosed anyway, but feel free to rate limit > it or something. OK Is anyone going to post a clean patch for that with a sign-off? Rafael
On Tue, Apr 20, 2010 at 10:18:18PM +1000, Michael Ellerman wrote: > On Mon, 2010-04-19 at 23:45 -0700, Christian Kujau wrote: > --- a/fs/proc/proc_devtree.c > +++ b/fs/proc/proc_devtree.c > @@ -175,6 +175,24 @@ retry: > return fixed_name; > } > > +static const char *unslash_name(const char *name) > +{ > + char *p, *fixed_name; > + > + fixed_name = kstrdup(name); > + if (!fixed_name) { > + printk(KERN_ERR "device-tree: Out of memory trying to unslash " > + "name \"%s\"\n", name); > + return name; > + } > + > + p = fixed_name; > + while ((p = strstr(p, "/"))) > + *p++ = '_'; This is wasteful. :-) Also, I hope we won't spit message every time allocation fail.
diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c index f8650dc..9502b48 100644 --- a/fs/proc/proc_devtree.c +++ b/fs/proc/proc_devtree.c @@ -175,6 +175,24 @@ retry: return fixed_name; } +static const char *unslash_name(const char *name) +{ + char *p, *fixed_name; + + fixed_name = kstrdup(name); + if (!fixed_name) { + printk(KERN_ERR "device-tree: Out of memory trying to unslash " + "name \"%s\"\n", name); + return name; + } + + p = fixed_name; + while ((p = strstr(p, "/"))) + *p++ = '_'; + + return fixed_name; +} + /* * Process a node, adding entries for its children and its properties. */ @@ -211,6 +229,9 @@ void proc_device_tree_add_node(struct device_node *np, if (duplicate_name(de, p)) p = fixup_name(np, de, p); + if (strstr(p, "/")) + p = unslash_name(p); + ent = __proc_device_tree_add_prop(de, pp, p); if (ent == NULL) break;