Commit df17fc2b authored May 25, 2024 by Nam Cao Committed by Yang Yingliang May 25, 2024

HID: i2c-hid: remove I2C_HID_READ_PENDING flag to prevent lock-up

mainline inclusion
from mainline-v6.9-rc6
commit 9c0f59e47a90c54d0153f8ddc0f80d7a36207d0e
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9QRN6
CVE: CVE-2024-35997

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=9c0f59e47a90c54d0153f8ddc0f80d7a36207d0e



--------------------------------

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 <nyandarknessgirl@gmail.com>
Closes: https://lore.kernel.org/r/CA+eeCSPUDpUg76ZO8dszSbAGn+UHjcyv8F1J-CUPVARAzEtW9w@mail.gmail.com


Fixes: 4a200c3b ("HID: i2c-hid: introduce HID over i2c specification implementation")
Cc: <stable@vger.kernel.org>
Signed-off-by: Nam Cao <namcao@linutronix.de>
Signed-off-by: Jiri Kosina <jkosina@suse.com>
Conflicts:
	drivers/hid/i2c-hid/i2c-hid-core.c
[yyl: adjust context]
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

parent 8d7f4806

drivers/hid/i2c-hid/i2c-hid-core.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -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
		@@ -256,7 +255,6 @@ 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)
		@@ -264,9 +262,6 @@ static int __i2c_hid_command(struct i2c_client *client,

		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;

		@@ -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;