From: Andrew Morton <akpm@osdl.org>
To: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] add return value checking of get_user() in set_vesa_blanking()
Date: Tue, 21 Nov 2006 17:31:15 -0800 [thread overview]
Message-ID: <20061121173115.6d258a5a.akpm@osdl.org> (raw)
In-Reply-To: <20061121141528.234a9335.yoichi_yuasa@tripeaks.co.jp>
On Tue, 21 Nov 2006 14:15:28 +0900
Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> wrote:
> Hi,
>
> This patch has added return value checking of get_user() in set_vesa_blanking().
>
> Yoichi
>
> Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
>
> diff -pruN -X generic/Documentation/dontdiff generic-orig/drivers/char/vt.c generic/drivers/char/vt.c
> --- generic-orig/drivers/char/vt.c 2006-11-21 10:23:39.409667250 +0900
> +++ generic/drivers/char/vt.c 2006-11-21 10:11:48.037209250 +0900
> @@ -3318,9 +3318,10 @@ postcore_initcall(vtconsole_class_init);
>
> static void set_vesa_blanking(char __user *p)
> {
> - unsigned int mode;
> - get_user(mode, p + 1);
> - vesa_blank_mode = (mode < 4) ? mode : 0;
> + unsigned int mode;
> +
> + if (!get_user(mode, p + 1))
> + vesa_blank_mode = (mode < 4) ? mode : 0;
> }
>
> void do_blank_screen(int entering_gfx)
How about we go all the way?
diff -puN drivers/char/vt.c~add-return-value-checking-of-get_user-in drivers/char/vt.c
--- a/drivers/char/vt.c~add-return-value-checking-of-get_user-in
+++ a/drivers/char/vt.c
@@ -152,7 +152,7 @@ static void gotoxy(struct vc_data *vc, i
static void save_cur(struct vc_data *vc);
static void reset_terminal(struct vc_data *vc, int do_clear);
static void con_flush_chars(struct tty_struct *tty);
-static void set_vesa_blanking(char __user *p);
+static int set_vesa_blanking(char __user *p);
static void set_cursor(struct vc_data *vc);
static void hide_cursor(struct vc_data *vc);
static void console_callback(void *ignored);
@@ -2369,7 +2369,7 @@ int tioclinux(struct tty_struct *tty, un
ret = __put_user(data, p);
break;
case TIOCL_SETVESABLANK:
- set_vesa_blanking(p);
+ ret = set_vesa_blanking(p);
break;
case TIOCL_GETKMSGREDIRECT:
data = kmsg_redirect;
@@ -3315,9 +3315,13 @@ postcore_initcall(vtconsole_class_init);
static void set_vesa_blanking(char __user *p)
{
- unsigned int mode;
- get_user(mode, p + 1);
- vesa_blank_mode = (mode < 4) ? mode : 0;
+ unsigned int mode;
+
+ if (get_user(mode, p + 1))
+ return -EFAULT;
+
+ vesa_blank_mode = (mode < 4) ? mode : 0;
+ return 0;
}
void do_blank_screen(int entering_gfx)
_
next prev parent reply other threads:[~2006-11-22 1:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-11-21 5:15 Yoichi Yuasa
2006-11-22 1:31 ` Andrew Morton [this message]
2006-11-22 5:17 ` Yoichi Yuasa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061121173115.6d258a5a.akpm@osdl.org \
--to=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=yoichi_yuasa@tripeaks.co.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®