proc: fix badness in fs/proc/generic.c
in [Kernel]
|
Prev: rmap: fix page_address_in_vma() to walk through anon_vma_chain
Next: [PATCH 10/10] KVM MMU: optimize sync/update unsync-page
From: Alexey Dobriyan on 22 Apr 2010 02:10 On Thu, Apr 22, 2010 at 7:10 AM, GuanJun He <heguanbo(a)gmail.com> wrote: > fix badness in fs/proc/generic.c, �Bug 15589 - �2.6.34-rc1: Badness at > fs/proc/generic.c:316 > this is just to get least waste. This is already fixed by powerpc folks, I believe. Without memory leak. > --- linux-2.6.34-rc1.orig/fs/proc/generic.c > +++ linux-2.6.34-rc1/fs/proc/generic.c > @@ -313,7 +313,15 @@ static int __xlate_proc_name(const char > � � � � � � � � � � � � � � � �break; > � � � � � � � �} > � � � � � � � �if (!de) { > - � � � � � � � � � � � WARN(1, "name '%s'\n", name); > + � � � � � � � � � � � char *dup = kstrdup(name, GFP_KERNEL); > + � � � � � � � � � � � if (dup) { > + � � � � � � � � � � � � � � � cp = dup; > + � � � � � � � � � � � � � � � while(*dup) { > + � � � � � � � � � � � � � � � � � � � if (*dup == '/') > + � � � � � � � � � � � � � � � � � � � � � � � *dup++ = '_'; > + � � � � � � � � � � � � � � � } > + � � � � � � � � � � � � � � � WARN(1, "name '%s'\n", cp); > + � � � � � � � � � � � } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Américo Wang on 21 Apr 2010 12:30
On Wed, Apr 21, 2010 at 07:09:42PM +0800, GuanJun He wrote: >fix badness in fs/proc/generic.c, Bug 15589 - 2.6.34-rc1: Badness at >fs/proc/generic.c:316 > >Signed-off-by: Guanjun He <heguanbo(a)gmail.com> NACK. The callers of __xlate_proc_name() all hold proc_subdir_lock. > >--- >diff -Nupr linux-2.6.34-rc1.orig/fs/proc/generic.c >linux-2.6.34-rc1/fs/proc/generic.c >--- linux-2.6.34-rc1.orig/fs/proc/generic.c 2010-03-09 >02:45:44.000000000 +0800 >+++ linux-2.6.34-rc1/fs/proc/generic.c 2010-04-21 19:02:49.000000000 +0800 >@@ -297,11 +297,13 @@ static int __xlate_proc_name(const char > const char *cp = name, *next; > struct proc_dir_entry *de; > int len; >+ int rtn = 0; > > de = *ret; > if (!de) > de = &proc_root; > >+ spin_lock(&proc_subdir_lock); > while (1) { > next = strchr(cp, '/'); > if (!next) >@@ -313,14 +315,17 @@ static int __xlate_proc_name(const char > break; > } > if (!de) { >- WARN(1, "name '%s'\n", name); >- return -ENOENT; >+ WARN(1, "name \"%s\"\n", name); >+ rtn = -ENOENT; >+ goto out; > } > cp += len + 1; > } > *residual = cp; > *ret = de; >- return 0; >+out: >+ spin_unlock(&proc_subdir_lock); >+ return rtn; > } > > static int xlate_proc_name(const char *name, struct proc_dir_entry **ret, >-- >To unsubscribe from this list: send the line "unsubscribe linux-kernel" in >the body of a message to majordomo(a)vger.kernel.org >More majordomo info at http://vger.kernel.org/majordomo-info.html >Please read the FAQ at http://www.tux.org/lkml/ -- Live like a child, think like the god. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |