vt: keyboard, union perm checks in vt_do_kdgkb_ioctl (cb58a504) · Commits · 戴 / test

Do the permission check on a single place. That is where perm is really checked. Signed-off-by:

drivers/tty/vt/keyboard.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -2040,9 +2040,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
		char *kbs;
		int ret;

		if (!capable(CAP_SYS_TTY_CONFIG))
		perm = 0;

		if (get_user(kb_func, &user_kdgkb->kb_func))
		return -EFAULT;

		@@ -2067,7 +2064,7 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
		break;
		}
		case KDSKBSENT:
		if (!perm)
		if (!perm \|\| !capable(CAP_SYS_TTY_CONFIG))
		return -EPERM;

		kbs = strndup_user(user_kdgkb->kb_string,