From 2e6611849d383e65ba682abdb4711cd9e31d5b1f Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@redhat.com>
Date: Sun, 30 Sep 2012 18:21:09 +0200
Subject: [PATCH] --- yaml --- r: 334764 b: refs/heads/master c:
 a5f658b71bc622b731961ea3addcf146ed3c599f h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/kernel/events/uprobes.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 421369b3d7bc..ffa3b6da1adc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b64b9c937a533f0bfbfc9f6ac93d3c3e2f97ab02
+refs/heads/master: a5f658b71bc622b731961ea3addcf146ed3c599f
diff --git a/trunk/kernel/events/uprobes.c b/trunk/kernel/events/uprobes.c
index 6136854da6c6..588a5575d64c 100644
--- a/trunk/kernel/events/uprobes.c
+++ b/trunk/kernel/events/uprobes.c
@@ -813,7 +813,9 @@ int uprobe_register(struct inode *inode, loff_t offset, struct uprobe_consumer *
 	mutex_lock(uprobes_hash(inode));
 	uprobe = alloc_uprobe(inode, offset);
 
-	if (uprobe && !consumer_add(uprobe, uc)) {
+	if (!uprobe) {
+		ret = -ENOMEM;
+	} else if (!consumer_add(uprobe, uc)) {
 		ret = __uprobe_register(uprobe);
 		if (ret) {
 			uprobe->consumers = NULL;