From 8336bd3aeb65d2064a015996f799bb896b647829 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Tue, 10 Aug 2010 18:02:54 -0700 Subject: [PATCH] --- yaml --- r: 208516 b: refs/heads/master c: e400c28524af2d344b1663b27bf28984fa959a0e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/cgroup.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bce2add9fbe0..4887d11f5329 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b24706a798d07cf40534d7763f608045e42e15f +refs/heads/master: e400c28524af2d344b1663b27bf28984fa959a0e diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c index d83cab06da87..192f88c5b0f9 100644 --- a/trunk/kernel/cgroup.c +++ b/trunk/kernel/cgroup.c @@ -1102,7 +1102,7 @@ static int parse_cgroupfs_options(char *data, struct cgroup_sb_opts *opts) if (opts->release_agent) return -EINVAL; opts->release_agent = - kstrndup(token + 14, PATH_MAX, GFP_KERNEL); + kstrndup(token + 14, PATH_MAX - 1, GFP_KERNEL); if (!opts->release_agent) return -ENOMEM; } else if (!strncmp(token, "name=", 5)) { @@ -1123,7 +1123,7 @@ static int parse_cgroupfs_options(char *data, struct cgroup_sb_opts *opts) if (opts->name) return -EINVAL; opts->name = kstrndup(name, - MAX_CGROUP_ROOT_NAMELEN, + MAX_CGROUP_ROOT_NAMELEN - 1, GFP_KERNEL); if (!opts->name) return -ENOMEM;