patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / char / vt.c

diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index f3d43dc..521b6fb 100644 (file)
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -152,7 +152,7 @@ static void gotoxy(int currcons, int new_x, int new_y);
 static void save_cur(int currcons);
 static void reset_terminal(int currcons, int do_clear);
 static void con_flush_chars(struct tty_struct *tty);
-static void set_vesa_blanking(unsigned long arg);
+static void set_vesa_blanking(char __user *p);
 static void set_cursor(int currcons);
 static void hide_cursor(int currcons);
 static void console_callback(void *ignored);
@@ -661,11 +661,14 @@ int vc_cons_allocated(unsigned int i)
 static void visual_init(int currcons, int init)
 {
     /* ++Geert: sw->con_init determines console size */
+    if (sw)
+       module_put(sw->owner);
     sw = conswitchp;
 #ifndef VT_SINGLE_DRIVER
     if (con_driver_map[currcons])
        sw = con_driver_map[currcons];
 #endif
+    __module_get(sw->owner);
     cons_num = currcons;
     display_fg = &master_display_fg;
     vc_cons[currcons].d->vc_uni_pagedir_loc = &vc_cons[currcons].d->vc_uni_pagedir;
@@ -773,17 +776,17 @@ int vc_resize(int currcons, unsigned int cols, unsigned int lines)
        old_row_size = video_size_row;
        old_screen_size = screenbuf_size;
 
-       video_num_lines = new_rows;
-       video_num_columns = new_cols;
-       video_size_row = new_row_size;
-       screenbuf_size = new_screen_size;
-
        err = resize_screen(currcons, new_cols, new_rows);
        if (err) {
                kfree(newscreen);
                return err;
        }
 
+       video_num_lines = new_rows;
+       video_num_columns = new_cols;
+       video_size_row = new_row_size;
+       screenbuf_size = new_screen_size;
+
        rlth = min(old_row_size, new_row_size);
        rrem = new_row_size - rlth;
        old_origin = origin;
@@ -808,8 +811,6 @@ int vc_resize(int currcons, unsigned int cols, unsigned int lines)
        screenbuf = newscreen;
        kmalloced = 1;
        screenbuf_size = new_screen_size;
-       if (IS_VISIBLE)
-               err = resize_screen(currcons, new_cols, new_rows);
        set_origin(currcons);
 
        /* do part of a reset_terminal() */
@@ -2273,6 +2274,7 @@ struct console vt_console_driver = {
 int tioclinux(struct tty_struct *tty, unsigned long arg)
 {
        char type, data;
+       char __user *p = (char __user *)arg;
        int lines;
        int ret;
 
@@ -2280,14 +2282,14 @@ int tioclinux(struct tty_struct *tty, unsigned long arg)
                return -EINVAL;
        if (current->signal->tty != tty && !capable(CAP_SYS_ADMIN))
                return -EPERM;
-       if (get_user(type, (char *)arg))
+       if (get_user(type, p))
                return -EFAULT;
        ret = 0;
        switch (type)
        {
                case TIOCL_SETSEL:
                        acquire_console_sem();
-                       ret = set_selection((struct tiocl_selection *)((char *)arg+1), tty, 1);
+                       ret = set_selection((struct tiocl_selection __user *)(p+1), tty);
                        release_console_sem();
                        break;
                case TIOCL_PASTESEL:
@@ -2297,7 +2299,7 @@ int tioclinux(struct tty_struct *tty, unsigned long arg)
                        unblank_screen();
                        break;
                case TIOCL_SELLOADLUT:
-                       ret = sel_loadlut(arg);
+                       ret = sel_loadlut(p);
                        break;
                case TIOCL_GETSHIFTSTATE:
                        
@@ -2308,20 +2310,20 @@ int tioclinux(struct tty_struct *tty, unsigned long arg)
         * related to the kernel should not use this.
         */
                        data = shift_state;
-                       ret = __put_user(data, (char *) arg);
+                       ret = __put_user(data, p);
                        break;
                case TIOCL_GETMOUSEREPORTING:
                        data = mouse_reporting();
-                       ret = __put_user(data, (char *) arg);
+                       ret = __put_user(data, p);
                        break;
                case TIOCL_SETVESABLANK:
-                       set_vesa_blanking(arg);
+                       set_vesa_blanking(p);
                        break;
                case TIOCL_SETKMSGREDIRECT:
                        if (!capable(CAP_SYS_ADMIN)) {
                                ret = -EPERM;
                        } else {
-                               if (get_user(data, (char *)arg+1))
+                               if (get_user(data, p+1))
                                        ret = -EFAULT;
                                else
                                        kmsg_redirect = data;
@@ -2331,7 +2333,7 @@ int tioclinux(struct tty_struct *tty, unsigned long arg)
                        ret = fg_console;
                        break;
                case TIOCL_SCROLLCONSOLE:
-                       if (get_user(lines, (s32 *)((char *)arg+4))) {
+                       if (get_user(lines, (s32 __user *)(p+4))) {
                                ret = -EFAULT;
                        } else {
                                scrollfront(lines);
@@ -2668,25 +2670,38 @@ static void clear_buffer_attributes(int currcons)
  *     and become default driver for newly opened ones.
  */
 
-void take_over_console(const struct consw *csw, int first, int last, int deflt)
+int take_over_console(const struct consw *csw, int first, int last, int deflt)
 {
        int i, j = -1;
        const char *desc;
+       struct module *owner;
+
+       owner = csw->owner;
+       if (!try_module_get(owner))
+               return -ENODEV;
 
        acquire_console_sem();
 
        desc = csw->con_startup();
        if (!desc) {
                release_console_sem();
-               return;
+               module_put(owner);
+               return -ENODEV;
        }
-       if (deflt)
+       if (deflt) {
+               if (conswitchp)
+                       module_put(conswitchp->owner);
+               __module_get(owner);
                conswitchp = csw;
+       }
 
        for (i = first; i <= last; i++) {
                int old_was_color;
                int currcons = i;
 
+               if (con_driver_map[i])
+                       module_put(con_driver_map[i]->owner);
+               __module_get(owner);
                con_driver_map[i] = csw;
 
                if (!vc_cons[i].d || !vc_cons[i].d->vc_sw)
@@ -2721,6 +2736,9 @@ void take_over_console(const struct consw *csw, int first, int last, int deflt)
                printk("to %s\n", desc);
 
        release_console_sem();
+
+       module_put(owner);
+       return 0;
 }
 
 void give_up_console(const struct consw *csw)
@@ -2728,8 +2746,10 @@ void give_up_console(const struct consw *csw)
        int i;
 
        for(i = 0; i < MAX_NR_CONSOLES; i++)
-               if (con_driver_map[i] == csw)
+               if (con_driver_map[i] == csw) {
+                       module_put(csw->owner);
                        con_driver_map[i] = NULL;
+               }
 }
 
 #endif
@@ -2738,11 +2758,10 @@ void give_up_console(const struct consw *csw)
  *     Screen blanking
  */
 
-static void set_vesa_blanking(unsigned long arg)
+static void set_vesa_blanking(char __user *p)
 {
-    char *argp = (char *)arg + 1;
     unsigned int mode;
-    get_user(mode, argp);
+    get_user(mode, p + 1);
     vesa_blank_mode = (mode < 4) ? mode : 0;
 }
 
@@ -2918,7 +2937,7 @@ void set_palette(int currcons)
                sw->con_set_palette(vc_cons[currcons].d, color_table);
 }
 
-static int set_get_cmap(unsigned char *arg, int set)
+static int set_get_cmap(unsigned char __user *arg, int set)
 {
     int i, j, k;
 
@@ -2953,7 +2972,7 @@ static int set_get_cmap(unsigned char *arg, int set)
  * map, 3 bytes per colour, 16 colours, range from 0 to 255.
  */
 
-int con_set_cmap(unsigned char *arg)
+int con_set_cmap(unsigned char __user *arg)
 {
        int rc;
 
@@ -2964,7 +2983,7 @@ int con_set_cmap(unsigned char *arg)
        return rc;
 }
 
-int con_get_cmap(unsigned char *arg)
+int con_get_cmap(unsigned char __user *arg)
 {
        int rc;
 
@@ -3018,7 +3037,8 @@ int con_font_op(int currcons, struct console_font_op *op)
                        goto quit;
                if (!op->height) {              /* Need to guess font height [compat] */
                        int h, i;
-                       u8 *charmap = op->data, tmp;
+                       u8 __user *charmap = op->data;
+                       u8 tmp;
                        
                        /* If from KDFONTOP ioctl, don't allow things which can be done in userland,
                           so that we can get rid of this soon */