mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: GuanJun He <heguanbo@gmail.com>
To: linux-kernel@vger.kernel.org
Subject: [PATCH 2.6.34-rc1] proc: fix badness in fs/proc/generic.c
Date: Wed, 21 Apr 2010 19:09:42 +0800	[thread overview]
Message-ID: <z2xccf7f6161004210409n817c86eckdb72d9cdb31e3be@mail.gmail.com> (raw)

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@gmail.com>

---
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,

             reply	other threads:[~2010-04-21 11:09 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-04-21 11:09 GuanJun He [this message]
2010-04-21 16:27 ` Américo Wang
2010-04-22  4:10 GuanJun He
2010-04-22  6:09 ` Alexey Dobriyan

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=z2xccf7f6161004210409n817c86eckdb72d9cdb31e3be@mail.gmail.com \
    --to=heguanbo@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    /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

all inboxes | Powered by JetHome®