Commit e5fa841a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull memcg-v1 fix from Al Viro:
 "memcg_write_event_control() oops fix"

* tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  memcg_write_event_control(): fix a user-triggerable oops
parents c2cdb13a 046667c4

mm/memcontrol-v1.c

+5 −2
Original line number Diff line number Diff line
@@ -1842,9 +1842,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'))

		return -EINVAL;

	if (*endp == '\0')

		buf = endp;

	else if (*endp == ' ')

		buf = endp + 1;

	else

		return -EINVAL;



	event = kzalloc(sizeof(*event), GFP_KERNEL);

	if (!event)