Skip to content

Commit

Permalink
HID: i2c-hid: remove I2C_HID_READ_PENDING flag to prevent lock-up
Browse files Browse the repository at this point in the history
commit 9c0f59e upstream.

The flag I2C_HID_READ_PENDING is used to serialize I2C operations.
However, this is not necessary, because I2C core already has its own
locking for that.

More importantly, this flag can cause a lock-up: if the flag is set in
i2c_hid_xfer() and an interrupt happens, the interrupt handler
(i2c_hid_irq) will check this flag and return immediately without doing
anything, then the interrupt handler will be invoked again in an
infinite loop.

Since interrupt handler is an RT task, it takes over the CPU and the
flag-clearing task never gets scheduled, thus we have a lock-up.

Delete this unnecessary flag.

Reported-and-tested-by: Eva Kurchatova <[email protected]>
Closes: https://lore.kernel.org/r/CA+eeCSPUDpUg76ZO8dszSbAGn+UHjcyv8F1J-CUPVARAzEtW9w@mail.gmail.com
Fixes: 4a200c3 ("HID: i2c-hid: introduce HID over i2c specification implementation")
Cc: <[email protected]>
Signed-off-by: Nam Cao <[email protected]>
Signed-off-by: Jiri Kosina <[email protected]>
[apply to v4.19 -> v5.15]
Signed-off-by: Nam Cao <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
covanam authored and gregkh committed May 2, 2024
1 parent 5fd7240 commit 5095b93
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions drivers/hid/i2c-hid/i2c-hid-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
/* flags */
#define I2C_HID_STARTED 0
#define I2C_HID_RESET_PENDING 1
#define I2C_HID_READ_PENDING 2

#define I2C_HID_PWR_ON 0x00
#define I2C_HID_PWR_SLEEP 0x01
Expand Down Expand Up @@ -256,17 +255,13 @@ static int __i2c_hid_command(struct i2c_client *client,
msg[1].len = data_len;
msg[1].buf = buf_recv;
msg_num = 2;
set_bit(I2C_HID_READ_PENDING, &ihid->flags);
}

if (wait)
set_bit(I2C_HID_RESET_PENDING, &ihid->flags);

ret = i2c_transfer(client->adapter, msg, msg_num);

if (data_len > 0)
clear_bit(I2C_HID_READ_PENDING, &ihid->flags);

if (ret != msg_num)
return ret < 0 ? ret : -EIO;

Expand Down Expand Up @@ -538,9 +533,6 @@ static irqreturn_t i2c_hid_irq(int irq, void *dev_id)
{
struct i2c_hid *ihid = dev_id;

if (test_bit(I2C_HID_READ_PENDING, &ihid->flags))
return IRQ_HANDLED;

i2c_hid_get_input(ihid);

return IRQ_HANDLED;
Expand Down

0 comments on commit 5095b93

Please sign in to comment.