Messages in this thread Patch in this message | | | Date | Fri, 03 Sep 2010 16:01:14 +0930 | From | Graham Gower <> | Subject | [PATCH] drivers/char/vt_ioctl.c: Fix VT_OPENQRY error value |
| |
When all VT's are in use, VT_OPENQRY casts -1 to unsigned char before returning it to userspace as an int. VT255 is not the next available console.
Signed-off-by: Graham Gower <graham.gower@gmail.com> --- drivers/char/vt_ioctl.c~ 2010-08-11 04:07:31.000000000 +0930 +++ drivers/char/vt_ioctl.c 2010-09-03 15:12:30.000000000 +0930 @@ -503,6 +503,7 @@ struct kbd_struct * kbd; unsigned int console; unsigned char ucval; + unsigned int uival; void __user *up = (void __user *)arg; int i, perm; int ret = 0; @@ -657,7 +658,7 @@ break; case KDGETMODE: - ucval = vc->vc_mode; + uival = vc->vc_mode; goto setint; case KDMAPDISP: @@ -695,7 +696,7 @@ break; case KDGKBMODE: - ucval = ((kbd->kbdmode == VC_RAW) ? K_RAW : + uival = ((kbd->kbdmode == VC_RAW) ? K_RAW : (kbd->kbdmode == VC_MEDIUMRAW) ? K_MEDIUMRAW : (kbd->kbdmode == VC_UNICODE) ? K_UNICODE : K_XLATE); @@ -949,7 +950,7 @@ for (i = 0; i < MAX_NR_CONSOLES; ++i) if (! VT_IS_IN_USE(i)) break; - ucval = i < MAX_NR_CONSOLES ? (i+1) : -1; + uival = i < MAX_NR_CONSOLES ? (i+1) : -1; goto setint; /*
| |