mirror of
https://github.com/Relintai/sdl2_frt.git
synced 2024-12-16 11:06:49 +01:00
Fixed bug 3546 - SDL_EVDEV_is_console() uses type of wrong size when calling ioctl
Rob When calling ioctl(fd, KDGKBTYPE, &type) in SDL_EVDEV_is_console(), we declare type as an 'int'. This should be a 'char'. The subsequent syscall, and kernel code, only writes the lower byte of the word. See: http://lxr.free-electrons.com/source/drivers/tty/vt/vt_ioctl.c?v=4.4#L399 ucval = KB_101; ret = put_user(ucval, (char __user *)arg); I've observed intermittent behavior related to this, and I can force an error condition by using an int initialized to 0xFFFFFFFF. The resulting ioctl will set type to 0XFFFFFF02, and the conditional return in SDL_EVDEV_is_console() will fail. Recommend changing to char, or masking off unused bits.
This commit is contained in:
parent
b3e8db802e
commit
41be9756f0
@ -150,7 +150,7 @@ static const char* EVDEV_consoles[] = {
|
||||
};
|
||||
|
||||
static int SDL_EVDEV_is_console(int fd) {
|
||||
int type;
|
||||
char type;
|
||||
|
||||
return isatty(fd) && ioctl(fd, KDGKBTYPE, &type) == 0 &&
|
||||
(type == KB_101 || type == KB_84);
|
||||
|
Loading…
Reference in New Issue
Block a user