diff options
| author | Li Zefan <lizf@cn.fujitsu.com> | 2008-11-19 15:36:48 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-12-05 10:55:10 -0800 |
| commit | b4c5ec8c76ad0ad0c70ee2270639e52222b63474 (patch) | |
| tree | 38e06c2612d41b970ee0ab4cf19740affcc2443f /kernel | |
| parent | a677fac636cbd9fdd1520e16514dee91f59f80be (diff) | |
| download | lwn-b4c5ec8c76ad0ad0c70ee2270639e52222b63474.tar.gz lwn-b4c5ec8c76ad0ad0c70ee2270639e52222b63474.zip | |
cgroups: fix a serious bug in cgroupstats
commit 33d283bef23132c48195eafc21449f8ba88fce6b upstream.
Try this, and you'll get oops immediately:
# cd Documentation/accounting/
# gcc -o getdelays getdelays.c
# mount -t cgroup -o debug xxx /mnt
# ./getdelays -C /mnt/tasks
Because a normal file's dentry->d_fsdata is a pointer to struct cftype,
not struct cgroup.
After the patch, it returns EINVAL if we try to get cgroupstats
from a normal file.
Cc: Balbir Singh <balbir@linux.vnet.ibm.com>
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Acked-by: Paul Menage <menage@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cgroup.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index d68bf2bc5cae..0ba3a5a1a12e 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -2045,10 +2045,13 @@ int cgroupstats_build(struct cgroupstats *stats, struct dentry *dentry) struct cgroup *cgrp; struct cgroup_iter it; struct task_struct *tsk; + /* - * Validate dentry by checking the superblock operations + * Validate dentry by checking the superblock operations, + * and make sure it's a directory. */ - if (dentry->d_sb->s_op != &cgroup_ops) + if (dentry->d_sb->s_op != &cgroup_ops || + !S_ISDIR(dentry->d_inode->i_mode)) goto err; ret = 0; |