Commit 1bab08c0 authored Jan 30, 2012 by Samuel Thibault Committed by Greg Kroah-Hartman Feb 02, 2012

drivers/tty/vt/vt_ioctl.c: fix KDFONTOP 32bit compatibility layer



KDFONTOP(GET) currently fails with EIO when being run in a 32bit userland
with a 64bit kernel if the font width is not 8.

This is because the compatibility layer introduced by e9216651 ("tty:
handle VT specific compat ioctls in vt driver") forces the addition of the
KD_FONT_FLAG_OLD flag, which makes con_font_get return EIO in such case.

This flag should *not* be set for KDFONTOP, since it's actually the whole
point of this flag (see comment in con_font_set for instance).

Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Arthur Taylor <art@ified.ca>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 62aa2b53

drivers/tty/vt/vt_ioctl.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1463,7 +1463,6 @@ compat_kdfontop_ioctl(struct compat_console_font_op __user *fontop,
	if (!perm && op->op != KD_FONT_OP_GET)		if (!perm && op->op != KD_FONT_OP_GET)
	return -EPERM;		return -EPERM;
	op->data = compat_ptr(((struct compat_console_font_op *)op)->data);		op->data = compat_ptr(((struct compat_console_font_op *)op)->data);
	op->flags \|= KD_FONT_FLAG_OLD;
	i = con_font_op(vc, op);		i = con_font_op(vc, op);
	if (i)		if (i)
	return i;		return i;