Attachment 158945 Details for Bug 302010

[patch] patch 001

0001-fix-console-in-PIO_FONT-GIO_FONT-calls.patch (text/plain), 1.58 KB, created by Dirk Mueller on 2007-08-22 09:43:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dirk Mueller

Created: 2007-08-22 09:43:15 UTC

Size: 1.58 KB

patch

obsolete

>From c1eb7ed3e152851231d9337088f98ccfef5745f9 Mon Sep 17 00:00:00 2001
>From: Dirk Mueller <dmueller@suse.de>
>Date: Wed, 22 Aug 2007 11:28:37 +0200
>Subject: [PATCH] fix console in PIO_FONT/GIO_FONT calls
>
>as mentioned in http://www.ussg.iu.edu/hypermail/linux/kernel/9808.0/0279.html,
>they should apply to the console that they were called for, not the current
>foreground console
>---
> fs/compat_ioctl.c |    7 +++++--
> 1 files changed, 5 insertions(+), 2 deletions(-)
>
>diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
>index a6c9078..d15c979 100644
>--- a/fs/compat_ioctl.c
>+++ b/fs/compat_ioctl.c
>@@ -1236,9 +1236,12 @@ static int do_fontx_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg,
> 	struct console_font_op op;
> 	compat_caddr_t data;
> 	int i, perm;
>+	struct vc_data *vc;
> 
> 	perm = vt_check(file);
> 	if (perm < 0) return perm;
>+
>+	vc = ((struct tty_struct *)file->private_data)->driver_data;
> 	
> 	switch (cmd) {
> 	case PIO_FONTX:
>@@ -1252,7 +1255,7 @@ static int do_fontx_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg,
> 		    get_user(data, &user_cfd->chardata))
> 			return -EFAULT;
> 		op.data = compat_ptr(data);
>-		return con_font_op(vc_cons[fg_console].d, &op);
>+		return con_font_op(vc, &op);
> 	case GIO_FONTX:
> 		op.op = KD_FONT_OP_GET;
> 		op.flags = 0;
>@@ -1264,7 +1267,7 @@ static int do_fontx_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg,
> 		if (!data)
> 			return 0;
> 		op.data = compat_ptr(data);
>-		i = con_font_op(vc_cons[fg_console].d, &op);
>+		i = con_font_op(vc, &op);
> 		if (i)
> 			return i;
> 		if (put_user(op.height, &user_cfd->charheight) ||
>-- 
>1.5.2.4
>

Actions: View | Diff

Attachments on bug 302010: 158818 | 158819 | 158945 | 158947 | 158948 | 159682