From 35c035277bd3a7d7fd9fe9782073a7ac097a0c0f Mon Sep 17 00:00:00 2001
From: Vitaliy Ivanov <vitalivanov@gmail.com>
Date: Mon, 25 Jul 2011 17:12:49 -0700
Subject: [PATCH] --- yaml --- r: 258984 b: refs/heads/master c:
 fbee8d933c775cdb9daac3063659cda38c1776c2 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/um/drivers/net_user.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bd98473179bc..2287a47189c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7fa38e7e9ead2dc7a346db10dd27a40dd83b2a26
+refs/heads/master: fbee8d933c775cdb9daac3063659cda38c1776c2
diff --git a/trunk/arch/um/drivers/net_user.c b/trunk/arch/um/drivers/net_user.c
index 9415dd9e63ef..520118888f16 100644
--- a/trunk/arch/um/drivers/net_user.c
+++ b/trunk/arch/um/drivers/net_user.c
@@ -228,7 +228,10 @@ static void change(char *dev, char *what, unsigned char *addr,
 		       "buffer\n");
 
 	pid = change_tramp(argv, output, output_len);
-	if (pid < 0) return;
+	if (pid < 0) {
+		kfree(output);
+		return;
+	}
 
 	if (output != NULL) {
 		printk("%s", output);