vt: keyboard, union perm checks in vt_do_kdsk_ioctl (ee1cf8a5) · 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
		@@ -2004,16 +2004,13 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
		if (copy_from_user(&kbe, user_kbe, sizeof(struct kbentry)))
		return -EFAULT;

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

		switch (cmd) {
		case KDGKBENT:
		return put_user(vt_kdgkbent(kb->kbdmode, kbe.kb_index,
		kbe.kb_table),
		&user_kbe->kb_value);
		case KDSKBENT:
		if (!perm)
		if (!perm \|\| !capable(CAP_SYS_TTY_CONFIG))
		return -EPERM;
		return vt_kdskbent(kb->kbdmode, kbe.kb_index, kbe.kb_table,
		kbe.kb_value);