diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-06-13 13:13:38 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-06-13 13:13:46 -0700 |
| commit | 4c7d3d79c736186bb2585f2d0a8231e1fac839da (patch) | |
| tree | 5abd973d57d360e24c9df2f17e942176ab2faaa5 /drivers/hid/hid-asus.c | |
| parent | 3ec8d7572a69d142d49f52b28ce8d84e5fef9131 (diff) | |
| parent | d20f6b3d747c36889b7ce75ee369182af3decb6b (diff) | |
| download | linux-4c7d3d79c736186bb2585f2d0a8231e1fac839da.tar.gz linux-4c7d3d79c736186bb2585f2d0a8231e1fac839da.tar.bz2 linux-4c7d3d79c736186bb2585f2d0a8231e1fac839da.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts, no adjacent changes.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/hid/hid-asus.c')
| -rw-r--r-- | drivers/hid/hid-asus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c index 02de2bf4f790..37e6d25593c2 100644 --- a/drivers/hid/hid-asus.c +++ b/drivers/hid/hid-asus.c @@ -1204,8 +1204,8 @@ static __u8 *asus_report_fixup(struct hid_device *hdev, __u8 *rdesc, } /* match many more n-key devices */ - if (drvdata->quirks & QUIRK_ROG_NKEY_KEYBOARD) { - for (int i = 0; i < *rsize + 1; i++) { + if (drvdata->quirks & QUIRK_ROG_NKEY_KEYBOARD && *rsize > 15) { + for (int i = 0; i < *rsize - 15; i++) { /* offset to the count from 0x5a report part always 14 */ if (rdesc[i] == 0x85 && rdesc[i + 1] == 0x5a && rdesc[i + 14] == 0x95 && rdesc[i + 15] == 0x05) { |