From 7b083b32924cf32e88fc524d29fd787a606b0fb9 Mon Sep 17 00:00:00 2001 From: Alexander Viro Date: Thu, 29 Jul 2004 08:47:55 -0700 Subject: [PATCH] con_set_font sanitized con_font_set() sanitized. We are passing console_font and flags into the method in separate arguments and we are not messing with console_font_op->data anymore - it's a userland pointer (to be annotated several patches later in the series, due to another abuse of console_font_op that needs to be fixed first), while console_font->data is kernel one and they don't mix anymore. We also do a sanity check (font width > 0) in the caller instead of method instances, since we are already checking for width <= 32 and height <= 32 there; doesn't make sense leaving that one in method instances. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds --- include/linux/console.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/linux') diff --git a/include/linux/console.h b/include/linux/console.h index 02da3a451213..4db1f52f6950 100644 --- a/include/linux/console.h +++ b/include/linux/console.h @@ -41,7 +41,7 @@ struct consw { void (*con_bmove)(struct vc_data *, int, int, int, int, int, int); int (*con_switch)(struct vc_data *); int (*con_blank)(struct vc_data *, int, int); - int (*con_font_set)(struct vc_data *, struct console_font_op *); + int (*con_font_set)(struct vc_data *, struct console_font *, unsigned); int (*con_font_get)(struct vc_data *, struct console_font_op *); int (*con_font_default)(struct vc_data *, struct console_font *, char *); int (*con_font_copy)(struct vc_data *, int); -- cgit v1.2.3