---

yaml --- r: 319983 b: refs/heads/master c: 25353b3 h: refs/heads/master i: 319981: 53a42d8 319979: 734fb93 319975: a6bf304 319967: 8420c76 v: v3
git-mirror · Jul 31, 2012 · 1ad506f · 1ad506f
1 parent ef03e4b
commit 1ad506f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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));