hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HID: steam: fix deadlock with input devices. 

When using this driver with the wireless dongle and some usermode
program that monitors every input device (acpid, for example), while
another usermode client opens and closes the low-level device
repeadedly, the system eventually deadlocks.

The reason is that steam_input_register_device() must not be called with
the mutex held, because the input subsystem has its own synchronization
that clashes with this one: it is possible that steam_input_open() is
called before input_register_device() returns, and since
steam_input_open() needs to lock the mutex, it deadlocks.

However we must hold the mutex when calling any function that sends
commands to the controller. If not, random commands end up falling fail.

Reported-by: Simon Gene Gottlieb <simon@gottliebtfreitag.de>
Signed-off-by: Rodrigo Rivas Costa <rodrigorivascosta@gmail.com>
Tested-by: Simon Gene Gottlieb <simon@gottliebtfreitag.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Rodrigo Rivas Costa 2019-03-15 20:09:10 +01:00 committed by Jiri Kosina
parent 1cbbd85fbc
commit 6b538cc213
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/hid/hid-steam.c
View File

@ -499,6 +499,7 @@ static void steam_battery_unregister(struct steam_device *steam)
static int steam_register(struct steam_device *steam) static int steam_register(struct steam_device *steam)
{ {
int ret; int ret;
bool client_opened;
/* /*
* This function can be called several times in a row with the * This function can be called several times in a row with the
@ -511,9 +512,11 @@ static int steam_register(struct steam_device *steam)
* Unlikely, but getting the serial could fail, and it is not so * Unlikely, but getting the serial could fail, and it is not so
* important, so make up a serial number and go on. * important, so make up a serial number and go on.
*/ */
mutex_lock(&steam->mutex);
if (steam_get_serial(steam) < 0) if (steam_get_serial(steam) < 0)
strlcpy(steam->serial_no, "XXXXXXXXXX", strlcpy(steam->serial_no, "XXXXXXXXXX",
sizeof(steam->serial_no)); sizeof(steam->serial_no));
mutex_unlock(&steam->mutex);
hid_info(steam->hdev, "Steam Controller '%s' connected", hid_info(steam->hdev, "Steam Controller '%s' connected",
steam->serial_no); steam->serial_no);
@ -528,14 +531,16 @@ static int steam_register(struct steam_device *steam)
} }
mutex_lock(&steam->mutex); mutex_lock(&steam->mutex);
if (!steam->client_opened) { client_opened = steam->client_opened;
if (!client_opened)
steam_set_lizard_mode(steam, lizard_mode); steam_set_lizard_mode(steam, lizard_mode);
ret = steam_input_register(steam);
} else {
ret = 0;
}
mutex_unlock(&steam->mutex); mutex_unlock(&steam->mutex);
if (!client_opened)
ret = steam_input_register(steam);
else
ret = 0;
return ret; return ret;
} }
@ -630,14 +635,21 @@ static void steam_client_ll_close(struct hid_device *hdev)
{ {
struct steam_device *steam = hdev->driver_data; struct steam_device *steam = hdev->driver_data;
unsigned long flags;
bool connected;
spin_lock_irqsave(&steam->lock, flags);
connected = steam->connected;
spin_unlock_irqrestore(&steam->lock, flags);
mutex_lock(&steam->mutex); mutex_lock(&steam->mutex);
steam->client_opened = false; steam->client_opened = false;
if (connected)
steam_set_lizard_mode(steam, lizard_mode);
mutex_unlock(&steam->mutex); mutex_unlock(&steam->mutex);
if (steam->connected) { if (connected)
steam_set_lizard_mode(steam, lizard_mode);
steam_input_register(steam); steam_input_register(steam);
}
} }
static int steam_client_ll_raw_request(struct hid_device *hdev, static int steam_client_ll_raw_request(struct hid_device *hdev,