Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 172411f1 authored by Davi Arnaut's avatar Davi Arnaut Committed by Linus Torvalds
Browse files

[PATCH] ebcdic do_kdsk_ioctl off-by-one 



Add a missing return check from strnlen_user and fixes a off-by-one when
terminating the string with zero.

Signed-off-by: default avatarDavi Arnaut <davi.arnaut@gmail.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 46d0d2c8

drivers/s390/char/keyboard.c

+5 −1
Original line number Diff line number Diff line
@@ -440,7 +440,11 @@ do_kdgkb_ioctl(struct kbd_data *kbd, struct kbsentry __user *u_kbs, 
			return -EPERM;

		len = strnlen_user(u_kbs->kb_string,

				   sizeof(u_kbs->kb_string) - 1);

		p = kmalloc(len, GFP_KERNEL);

		if (!len)

			return -EFAULT;

		if (len > sizeof(u_kbs->kb_string) - 1)

			return -EINVAL;

		p = kmalloc(len + 1, GFP_KERNEL);

		if (!p)

			return -ENOMEM;

		if (copy_from_user(p, u_kbs->kb_string, len)) {