[PATCH] device-tree: Drop properties with "/" in their name

[PATCH] device-tree: Drop properties with "/" in their name

[Michael Ellerman]

Some bogus firmwares include properties with "/" in their name. This
causes problems when creating the /proc/device-tree file system,
because the slash is taken to indicate a directory.

We don't care about those properties, and we don't want to encourage
them, so just throw them away when creating /proc/device-tree.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
---

Hi Christian, if you could test this new patch that'd be great, thanks!


 fs/proc/proc_devtree.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c
index ce94801..d9396a4 100644
--- a/fs/proc/proc_devtree.c
+++ b/fs/proc/proc_devtree.c
@@ -209,6 +209,9 @@ void proc_device_tree_add_node(struct device_node *np,
 	for (pp = np->properties; pp != NULL; pp = pp->next) {
 		p = pp->name;
 
+		if (strchr(p, '/'))
+			continue;
+
 		if (duplicate_name(de, p))
 			p = fixup_name(np, de, p);
 
-- 
1.7.0.4

Re: [PATCH] device-tree: Drop properties with "/" in their name

[Michael Ellerman]

[-- Attachment #1: Type: text/plain, Size: 709 bytes --]

On Wed, 2010-05-19 at 22:32 +1000, Michael Ellerman wrote:
> Some bogus firmwares include properties with "/" in their name. This
> causes problems when creating the /proc/device-tree file system,
> because the slash is taken to indicate a directory.
> 
> We don't care about those properties, and we don't want to encourage
> them, so just throw them away when creating /proc/device-tree.
> 
> Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
> ---
> 
> Hi Christian, if you could test this new patch that'd be great, thanks!

And thanks to Christian for testing it:

https://bugzilla.kernel.org/show_bug.cgi?id=15589

Tested-by: Christian Kujau <lists@nerdbynature.de>


cheers

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH] device-tree: Drop properties with "/" in their name

[Christian Kujau]

On Wed, 19 May 2010 at 22:32, Michael Ellerman wrote:
> Some bogus firmwares include properties with "/" in their name. This
> causes problems when creating the /proc/device-tree file system,
> because the slash is taken to indicate a directory.
> 
> We don't care about those properties, and we don't want to encourage
> them, so just throw them away when creating /proc/device-tree.
> 
> Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
> ---
> 
> Hi Christian, if you could test this new patch that'd be great, thanks!

I've tested the patch, the Badness is gone and the system is stable as 
ever. Will this be pushed to 2.6.35?

Thanks,
Christian.

>  fs/proc/proc_devtree.c |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c
> index ce94801..d9396a4 100644
> --- a/fs/proc/proc_devtree.c
> +++ b/fs/proc/proc_devtree.c
> @@ -209,6 +209,9 @@ void proc_device_tree_add_node(struct device_node *np,
>  	for (pp = np->properties; pp != NULL; pp = pp->next) {
>  		p = pp->name;
>  
> +		if (strchr(p, '/'))
> +			continue;
> +
>  		if (duplicate_name(de, p))
>  			p = fixup_name(np, de, p);
>  
> -- 
> 1.7.0.4
> 
> 
> 

-- 
BOFH excuse #334:

50% of the manual is in .pdf readme files

Re: [PATCH] device-tree: Drop properties with "/" in their name

[Michael Ellerman]

[-- Attachment #1: Type: text/plain, Size: 1612 bytes --]

On Sun, 2010-06-13 at 00:47 -0700, Christian Kujau wrote:
> On Wed, 19 May 2010 at 22:32, Michael Ellerman wrote:
> > Some bogus firmwares include properties with "/" in their name. This
> > causes problems when creating the /proc/device-tree file system,
> > because the slash is taken to indicate a directory.
> > 
> > We don't care about those properties, and we don't want to encourage
> > them, so just throw them away when creating /proc/device-tree.
> > 
> > Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
> > ---
> > 
> > Hi Christian, if you could test this new patch that'd be great, thanks!
> 
> I've tested the patch, the Badness is gone and the system is stable as 
> ever. Will this be pushed to 2.6.35?

Hopefully yes :)

Looks like Ben has deferred it to Grant in patchwork, and he is pretty
busy I think with other OF patches ATM. Maybe he'll grab it or Ben can
pick it up .. guys ? :)

http://patchwork.ozlabs.org/patch/52978/

cheers

> >  fs/proc/proc_devtree.c |    3 +++
> >  1 files changed, 3 insertions(+), 0 deletions(-)
> > 
> > diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c
> > index ce94801..d9396a4 100644
> > --- a/fs/proc/proc_devtree.c
> > +++ b/fs/proc/proc_devtree.c
> > @@ -209,6 +209,9 @@ void proc_device_tree_add_node(struct device_node *np,
> >  	for (pp = np->properties; pp != NULL; pp = pp->next) {
> >  		p = pp->name;
> >  
> > +		if (strchr(p, '/'))
> > +			continue;
> > +
> >  		if (duplicate_name(de, p))
> >  			p = fixup_name(np, de, p);
> >  
> > -- 
> > 1.7.0.4
> > 
> > 
> > 
> 



[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]