Attachment 158948 Details for Bug 302010

[patch] patch 003

0003-add-IS_FG-checks-to-all-possibly-harmful-operation.patch (text/plain), 1.80 KB, created by Dirk Mueller on 2007-08-22 09:44:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dirk Mueller

Created: 2007-08-22 09:44:00 UTC

Size: 1.80 KB

patch

obsolete

>From 4f4234777688618eec9befc072e0199b071ba882 Mon Sep 17 00:00:00 2001
>From: Dirk Mueller <dmueller@suse.de>
>Date: Wed, 22 Aug 2007 11:32:46 +0200
>Subject: [PATCH] add IS_FG() checks to all possibly harmful operations
>
>the set_cursor() code already checked for IS_FG, however
>the font related ones didn`t. Unify this.
>---
> drivers/char/vt.c |   11 +++++------
> 1 files changed, 5 insertions(+), 6 deletions(-)
>
>diff --git a/drivers/char/vt.c b/drivers/char/vt.c
>index edb7002..0d90be9 100644
>--- a/drivers/char/vt.c
>+++ b/drivers/char/vt.c
>@@ -569,8 +569,7 @@ static void hide_cursor(struct vc_data *vc)
> 
> static void set_cursor(struct vc_data *vc)
> {
>-	if (!IS_FG(vc) || console_blanked ||
>-	    vc->vc_mode == KD_GRAPHICS)
>+	if (!IS_FG(vc) || console_blanked || vc->vc_mode == KD_GRAPHICS)
> 		return;
> 	if (vc->vc_deccm) {
> 		if (vc == sel_cons)
>@@ -3748,7 +3747,7 @@ static int con_font_get(struct vc_data *vc, struct console_font_op *op)
> 	int rc = -EINVAL;
> 	int c;
> 
>-	if (vc->vc_mode != KD_TEXT)
>+	if (!IS_FG(vc) || vc->vc_mode != KD_TEXT)
> 		return -EINVAL;
> 
> 	if (op->data) {
>@@ -3803,7 +3802,7 @@ static int con_font_set(struct vc_data *vc, struct console_font_op *op)
> 	int rc = -EINVAL;
> 	int size;
> 
>-	if (vc->vc_mode != KD_TEXT)
>+	if (!IS_FG(vc) || vc->vc_mode != KD_TEXT)
> 		return -EINVAL;
> 	if (!op->data)
> 		return -EINVAL;
>@@ -3861,7 +3860,7 @@ static int con_font_default(struct vc_data *vc, struct console_font_op *op)
> 	char *s = name;
> 	int rc;
> 
>-	if (vc->vc_mode != KD_TEXT)
>+	if (!IS_FG(vc) || vc->vc_mode != KD_TEXT)
> 		return -EINVAL;
> 
> 	if (!op->data)
>@@ -3889,7 +3888,7 @@ static int con_font_copy(struct vc_data *vc, struct console_font_op *op)
> 	int con = op->height;
> 	int rc;
> 
>-	if (vc->vc_mode != KD_TEXT)
>+	if (!IS_FG(vc) || vc->vc_mode != KD_TEXT)
> 		return -EINVAL;
> 
> 	acquire_console_sem();
>-- 
>1.5.2.4
>

Actions: View | Diff

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