From ad56899bb049c47bd5756988ad664d8f4c6438e9 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Fri, 29 Oct 2010 16:10:26 +0200
Subject: [PATCH] --- yaml --- r: 220966 b: refs/heads/master c:
 520efd1ace3f826120482e57a95d649b4e1c1684 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/net/mac80211/debugfs_key.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d314f2d759cf..d0c4792beb7b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 731b2034999bbfe86c9074f1b0d611940bf7c323
+refs/heads/master: 520efd1ace3f826120482e57a95d649b4e1c1684
diff --git a/trunk/net/mac80211/debugfs_key.c b/trunk/net/mac80211/debugfs_key.c
index 4aa47d074a79..1243d1db5c59 100644
--- a/trunk/net/mac80211/debugfs_key.c
+++ b/trunk/net/mac80211/debugfs_key.c
@@ -203,9 +203,13 @@ static ssize_t key_key_read(struct file *file, char __user *userbuf,
 			    size_t count, loff_t *ppos)
 {
 	struct ieee80211_key *key = file->private_data;
-	int i, res, bufsize = 2 * key->conf.keylen + 2;
+	int i, bufsize = 2 * key->conf.keylen + 2;
 	char *buf = kmalloc(bufsize, GFP_KERNEL);
 	char *p = buf;
+	ssize_t res;
+
+	if (!buf)
+		return -ENOMEM;
 
 	for (i = 0; i < key->conf.keylen; i++)
 		p += scnprintf(p, bufsize + buf - p, "%02x", key->conf.key[i]);