geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug 4486 - Segfault when pressing a trigger on the Steam Controller (Linux) 

Matteo Beniamino

Pressing a trigger button on a Steam Controller causes a segmentation fault both with stable version and latest mercurial head on Linux. I'm using the recent hid_steam kernel module with lizard_mode disabled (that is no keyboard/mouse emulation). I suspect this is what's happening: the driver exposes two hats. The two hats have indices 0 and 2. Inside linux/SDL_sysjoystick.c two hats are allocated in allocate_hatdata for joystick->hwdata->hats. In HandleHat function the hat parameter (that can be 2) is directly used as the index of the array that only has two elements, causing an out of bounds access. SDL is not expecting to have "holes" between hats indices.

The index 2 is calculated in HandleInputEvents() as (ABS_HAT2X - ABS_HAT0X) / 2 where ABS_HAT2X is the value associated to the hat inside the hid_steam module.
Sam Lantinga 2019-06-12 10:32:36 -07:00
parent d01150abc2
commit a1a2f9b9f8
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/joystick/linux/SDL_sysjoystick.c
View File

@ -609,17 +609,18 @@ ConfigJoystick(SDL_Joystick * joystick, int fd)
for (i = ABS_HAT0X; i <= ABS_HAT3Y; i += 2) { for (i = ABS_HAT0X; i <= ABS_HAT3Y; i += 2) {
if (test_bit(i, absbit) || test_bit(i + 1, absbit)) { if (test_bit(i, absbit) || test_bit(i + 1, absbit)) {
struct input_absinfo absinfo; struct input_absinfo absinfo;
int hat_index = (i - ABS_HAT0X) / 2;
if (ioctl(fd, EVIOCGABS(i), &absinfo) < 0) { if (ioctl(fd, EVIOCGABS(i), &absinfo) < 0) {
continue; continue;
} }
#ifdef DEBUG_INPUT_EVENTS #ifdef DEBUG_INPUT_EVENTS
printf("Joystick has hat %d\n", (i - ABS_HAT0X) / 2); printf("Joystick has hat %d\n", hat_index);
printf("Values = { %d, %d, %d, %d, %d }\n", printf("Values = { %d, %d, %d, %d, %d }\n",
absinfo.value, absinfo.minimum, absinfo.maximum, absinfo.value, absinfo.minimum, absinfo.maximum,
absinfo.fuzz, absinfo.flat); absinfo.fuzz, absinfo.flat);
#endif /* DEBUG_INPUT_EVENTS */ #endif /* DEBUG_INPUT_EVENTS */
++joystick->nhats; joystick->hwdata->hats_indices[joystick->nhats++] = hat_index;
} }
} }
if (test_bit(REL_X, relbit) || test_bit(REL_Y, relbit)) { if (test_bit(REL_X, relbit) || test_bit(REL_Y, relbit)) {
@ -762,7 +763,7 @@ HandleHat(SDL_Joystick * stick, Uint8 hat, int axis, int value)
{SDL_HAT_LEFTDOWN, SDL_HAT_DOWN, SDL_HAT_RIGHTDOWN} {SDL_HAT_LEFTDOWN, SDL_HAT_DOWN, SDL_HAT_RIGHTDOWN}
}; };
the_hat = &stick->hwdata->hats[hat]; the_hat = &stick->hwdata->hats[stick->hwdata->hats_indices[hat]];
if (value < 0) { if (value < 0) {
value = 0; value = 0;
} else if (value == 0) { } else if (value == 0) {

2
src/joystick/linux/SDL_sysjoystick_c.h
View File

@ -62,6 +62,8 @@ struct joystick_hwdata
/* Steam Controller support */ /* Steam Controller support */
SDL_bool m_bSteamController; SDL_bool m_bSteamController;
/* 4 = (ABS_HAT3X-ABS_HAT0X)/2 (see input-event-codes.h in kernel) */
int hats_indices[4];
}; };
#endif /* SDL_sysjoystick_c_h_ */ #endif /* SDL_sysjoystick_c_h_ */