From fe9e7053f796d1e1fe68bb066329d355cb77c70f Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Wed, 10 Oct 2012 16:43:21 -0400
Subject: [PATCH] --- yaml --- r: 333911 b: refs/heads/master c:
 f81700bd831efcd12eb7f0e66b24b16c2ad00a32 h: refs/heads/master i:   333909:
 d545e376a0df3b51a06a7e6dba08a0a8dba2bfa9   333907:
 711b2b76b706c9833d2b8ab52a48ec481d70248c   333903:
 cdf42c12dfc0c35aededc75215e144e068b27798 v: v3

---
 [refs]               | 2 +-
 trunk/fs/proc/base.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f0e3c0796885..802d8710ede0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7950e3852ab86826b7349a535d2e8b0000340d7f
+refs/heads/master: f81700bd831efcd12eb7f0e66b24b16c2ad00a32
diff --git a/trunk/fs/proc/base.c b/trunk/fs/proc/base.c
index ef5c84be66f9..144a96732dd7 100644
--- a/trunk/fs/proc/base.c
+++ b/trunk/fs/proc/base.c
@@ -2258,7 +2258,8 @@ static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd)
 	pid_t tgid = task_tgid_nr_ns(current, ns);
 	char *name = ERR_PTR(-ENOENT);
 	if (tgid) {
-		name = __getname();
+		/* 11 for max length of signed int in decimal + NULL term */
+		name = kmalloc(12, GFP_KERNEL);
 		if (!name)
 			name = ERR_PTR(-ENOMEM);
 		else
@@ -2273,7 +2274,7 @@ static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd,
 {
 	char *s = nd_get_link(nd);
 	if (!IS_ERR(s))
-		__putname(s);
+		kfree(s);
 }
 
 static const struct inode_operations proc_self_inode_operations = {