diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2024-07-21 14:45:08 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-09-04 13:17:30 +0200 |
| commit | ad149f5585345e383baa65f1539d816cd715fd3b (patch) | |
| tree | 1f8792dfd8d70c1c060d1709b81eba7bf2594401 /mm | |
| parent | 0452e15e7fe16cba6c64850270bbb913fa2cd59f (diff) | |
| download | linux-ad149f5585345e383baa65f1539d816cd715fd3b.tar.gz linux-ad149f5585345e383baa65f1539d816cd715fd3b.tar.bz2 linux-ad149f5585345e383baa65f1539d816cd715fd3b.zip | |
memcg_write_event_control(): fix a user-triggerable oops
commit 046667c4d3196938e992fba0dfcde570aa85cd0e upstream.
we are *not* guaranteed that anything past the terminating NUL
is mapped (let alone initialized with anything sane).
Fixes: 0dea116876ee ("cgroup: implement eventfd-based generic API for notifications")
Cc: stable@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/memcontrol.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 186ae9dba0fd..874f91715296 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -4884,9 +4884,12 @@ static ssize_t memcg_write_event_control(struct kernfs_open_file *of, buf = endp + 1; cfd = simple_strtoul(buf, &endp, 10); - if ((*endp != ' ') && (*endp != '\0')) + if (*endp == '\0') + buf = endp; + else if (*endp == ' ') + buf = endp + 1; + else return -EINVAL; - buf = endp + 1; event = kzalloc(sizeof(*event), GFP_KERNEL); if (!event) |