Linux Input/HID development
 help / color / mirror / Atom feed
From: Silvan Jegen <s.jegen@gmail.com>
To: Camila Alvarez <cam.alvarez.i@gmail.com>
Cc: Jiri Kosina <jikos@kernel.org>,
	Benjamin Tissoires <bentiss@kernel.org>,
	linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
	syzbot+24c0361074799d02c452@syzkaller.appspotmail.com
Subject: Re: [PATCH] usb: fix slab-out-of-bounds Read in cougar_report_fixup
Date: Wed, 31 Jul 2024 21:46:38 +0200	[thread overview]
Message-ID: <ZqqUnrJkvfsSS9Ag@homearch.localdomain> (raw)
In-Reply-To: <20240730234242.256598-1-cam.alvarez.i@gmail.com>

On Tue, Jul 30, 2024 at 07:42:43PM -0400, Camila Alvarez wrote:
> report_fixup for the Cougar 500k Gaming Keyboard was not verifying
> that the report descriptor size was correct before accessing it
> 
> Reported-by: syzbot+24c0361074799d02c452@syzkaller.appspotmail.com
> Closes: https://syzkaller.appspot.com/bug?extid=24c0361074799d02c452
> Signed-off-by: Camila Alvarez <cam.alvarez.i@gmail.com>
> ---
>  drivers/hid/hid-cougar.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

This LGTM!

Reviewed-by: Silvan Jegen <s.jegen@gmail.com>

> 
> diff --git a/drivers/hid/hid-cougar.c b/drivers/hid/hid-cougar.c
> index cb8bd8aae15b..0fa785f52707 100644
> --- a/drivers/hid/hid-cougar.c
> +++ b/drivers/hid/hid-cougar.c
> @@ -106,7 +106,7 @@ static void cougar_fix_g6_mapping(void)
>  static __u8 *cougar_report_fixup(struct hid_device *hdev, __u8 *rdesc,
>  				 unsigned int *rsize)
>  {
> -	if (rdesc[2] == 0x09 && rdesc[3] == 0x02 &&
> +	if (*rsize >= 117 && rdesc[2] == 0x09 && rdesc[3] == 0x02 &&
>  	    (rdesc[115] | rdesc[116] << 8) >= HID_MAX_USAGES) {
>  		hid_info(hdev,
>  			"usage count exceeds max: fixing up report descriptor\n");
> -- 
> 2.34.1
> 
> 

  reply	other threads:[~2024-07-31 19:46 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-30 23:42 [PATCH] usb: fix slab-out-of-bounds Read in cougar_report_fixup Camila Alvarez
2024-07-31 19:46 ` Silvan Jegen [this message]
2024-08-01 11:04 ` Jiri Kosina
2024-08-01 15:58   ` Camila Alvarez Inostroza

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ZqqUnrJkvfsSS9Ag@homearch.localdomain \
    --to=s.jegen@gmail.com \
    --cc=bentiss@kernel.org \
    --cc=cam.alvarez.i@gmail.com \
    --cc=jikos@kernel.org \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=syzbot+24c0361074799d02c452@syzkaller.appspotmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox