summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2012-07-30 14:42:49 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-30 17:25:21 -0700
commit25353b3377d5a75d4b830477bb90a3691155de72 (patch)
treefc1227929cb2cf7c5356e19c5adbb238bcfb14bb
parentfd4b616b0fbb77e3f349e7d60914f2b7c7e39f9c (diff)
downloadlinux-25353b3377d5a75d4b830477bb90a3691155de72.tar.bz2
taskstats: check nla_reserve() return
Addresses https://bugzilla.kernel.org/show_bug.cgi?id=44621 Reported-by: <rucsoftsec@gmail.com> Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--kernel/taskstats.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/taskstats.c b/kernel/taskstats.c
index e66046456f4f..d0a32796550f 100644
--- a/kernel/taskstats.c
+++ b/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));