s390 keyboard.c: don't open-code strndup_user()

... especially not with off-by-ones (strnlen_user() already includes NUL
into its count).

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/drivers/s390/char/keyboard.c b/drivers/s390/char/keyboard.c
index ba0e4f93503db5e4c96a98b6222bfff87844a86a..186d05e4c767888d9b71073fe92b63800c31d8aa 100644 (file)
--- a/drivers/s390/char/keyboard.c
+++ b/drivers/s390/char/keyboard.c
@@ -433,12 +433,7 @@ do_kdgkb_ioctl(struct kbd_data *kbd, struct kbsentry __user *u_kbs,
        case KDSKBSENT:
                if (!perm)
                        return -EPERM;
-               len = strnlen_user(u_kbs->kb_string, sizeof(u_kbs->kb_string));
-               if (!len)
-                       return -EFAULT;
-               if (len > sizeof(u_kbs->kb_string))
-                       return -EINVAL;
-               p = memdup_user_nul(u_kbs->kb_string, len);
+               p = strndup_user(u_kbs->kb_string, sizeof(u_kbs->kb_string));
                if (IS_ERR(p))
                        return PTR_ERR(p);
                kfree(kbd->func_table[kb_func]);