From 1ad506fc8e586cb8fe3192aaa52a72f552f60533 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Mon, 30 Jul 2012 14:42:49 -0700
Subject: [PATCH] --- yaml --- r: 319983 b: refs/heads/master c:
 25353b3377d5a75d4b830477bb90a3691155de72 h: refs/heads/master i:   319981:
 53a42d81584819f4bd7048224518ecdb64721163   319979:
 734fb933e7b1726bf5d3f41e021ee9bfff70d954   319975:
 a6bf3045867822fa6e0b32e533a50ee3a9776e54   319967:
 8420c76a580b5dc10fc2198e609bc353788bc71f v: v3

---
 [refs]                   | 2 +-
 trunk/kernel/taskstats.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 22b741d899a6..f0ad64f1ea4e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd4b616b0fbb77e3f349e7d60914f2b7c7e39f9c
+refs/heads/master: 25353b3377d5a75d4b830477bb90a3691155de72
diff --git a/trunk/kernel/taskstats.c b/trunk/kernel/taskstats.c
index e66046456f4f..d0a32796550f 100644
--- a/trunk/kernel/taskstats.c
+++ b/trunk/kernel/taskstats.c
@@ -436,6 +436,11 @@ static int cgroupstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
 
 	na = nla_reserve(rep_skb, CGROUPSTATS_TYPE_CGROUP_STATS,
 				sizeof(struct cgroupstats));
+	if (na == NULL) {
+		rc = -EMSGSIZE;
+		goto err;
+	}
+
 	stats = nla_data(na);
 	memset(stats, 0, sizeof(*stats));