lkml.org 
[lkml]   [2010]   [Dec]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] [85/223] drivers/char/vt_ioctl.c: fix VT_OPENQRY error value
    Date
    2.6.35-longterm review patch.  If anyone has any objections, please let me know.

    ------------------
    From: Graham Gower <graham.gower@gmail.com>

    commit 1e0ad2881d50becaeea70ec696a80afeadf944d2 upstream.

    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>
    Cc: Greg KH <greg@kroah.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Andi Kleen <ak@linux.intel.com>

    ---
    drivers/char/vt_ioctl.c | 11 ++++++-----
    1 file changed, 6 insertions(+), 5 deletions(-)

    Index: linux/drivers/char/vt_ioctl.c
    ===================================================================
    --- linux.orig/drivers/char/vt_ioctl.c
    +++ linux/drivers/char/vt_ioctl.c
    @@ -503,6 +503,7 @@ int vt_ioctl(struct tty_struct *tty, str
    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 @@ int vt_ioctl(struct tty_struct *tty, str
    break;

    case KDGETMODE:
    - ucval = vc->vc_mode;
    + uival = vc->vc_mode;
    goto setint;

    case KDMAPDISP:
    @@ -695,7 +696,7 @@ int vt_ioctl(struct tty_struct *tty, str
    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);
    @@ -717,9 +718,9 @@ int vt_ioctl(struct tty_struct *tty, str
    break;

    case KDGKBMETA:
    - ucval = (vc_kbd_mode(kbd, VC_META) ? K_ESCPREFIX : K_METABIT);
    + uival = (vc_kbd_mode(kbd, VC_META) ? K_ESCPREFIX : K_METABIT);
    setint:
    - ret = put_user(ucval, (int __user *)arg);
    + ret = put_user(uival, (int __user *)arg);
    break;

    case KDGETKEYCODE:
    @@ -949,7 +950,7 @@ int vt_ioctl(struct tty_struct *tty, str
    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;

    /*

    \
     
     \ /
      Last update: 2010-12-13 01:17    [W:0.021 / U:0.348 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site