| Message ID | 20240602085023.1720492-1-andrewjballance@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 89e1ee118d6f0ee6bd6e80d8fe08839875daa241 |
| Headers | show |
| Series | [v2] hid: asus: asus_report_fixup: fix potential read out of bounds | expand |
On Sun, Jun 02, 2024 at 03:50:23AM -0500, Andrew Ballance wrote: > syzbot reported a potential read out of bounds in asus_report_fixup. > > this patch adds checks so that a read out of bounds will not occur > > Signed-off-by: Andrew Ballance <andrewjballance@gmail.com> > Reported-by: syzbot+07762f019fd03d01f04c@syzkaller.appspotmail.com > Closes: https://syzkaller.appspot.com/bug?extid=07762f019fd03d01f04c > Fixes: 59d2f5b73921 ("HID: asus: fix more n-key report descriptors if n-key quirked") > --- > drivers/hid/hid-asus.c | 4 ++-- > 1 file 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) { > -- > 2.45.1 > > Hi, This is the friendly patch-bot of Greg Kroah-Hartman. You have sent him a patch that has triggered this response. He used to manually respond to these common problems, but in order to save his sanity (he kept writing the same thing over and over, yet to different people), I was created. Hopefully you will not take offence and will fix the problem in your patch and resubmit it so that it can be accepted into the Linux kernel tree. You are receiving this message because of the following common error(s) as indicated below: - This looks like a new version of a previously submitted patch, but you did not list below the --- line any changes from the previous version. Please read the section entitled "The canonical patch format" in the kernel file, Documentation/process/submitting-patches.rst for what needs to be done here to properly describe this. If you wish to discuss this problem further, or you have questions about how to resolve this issue, please feel free to respond to this email and Greg will reply once he has dug out from the pending patches received from other developers. thanks, greg k-h's patch email bot
On Sun, 02 Jun 2024 03:50:23 -0500, Andrew Ballance wrote: > syzbot reported a potential read out of bounds in asus_report_fixup. > > this patch adds checks so that a read out of bounds will not occur > > Applied to hid/hid.git (for-6.10/upstream-fixes), thanks! [1/1] hid: asus: asus_report_fixup: fix potential read out of bounds https://git.kernel.org/hid/hid/c/cfacaaf33cd7 Cheers,
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) {
syzbot reported a potential read out of bounds in asus_report_fixup. this patch adds checks so that a read out of bounds will not occur Signed-off-by: Andrew Ballance <andrewjballance@gmail.com> Reported-by: syzbot+07762f019fd03d01f04c@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=07762f019fd03d01f04c Fixes: 59d2f5b73921 ("HID: asus: fix more n-key report descriptors if n-key quirked") --- drivers/hid/hid-asus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)