drivers/char/vt_ioctl.c: Fix VT_OPENQRY error value
PATCH 1/1 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 <[email protected]>
char/vt_ioctl.c renamed from char/vt_ioctl.c~ +4 -3
@@ -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;/*
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 <[email protected]>
---
Sorry, I seem to have dropped a patch fragment in the previous mail.
char/vt_ioctl.c renamed from char/vt_ioctl.c~ +6 -5
@@ -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 );
@@ -717,9 +718,9 @@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 @@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;/*