Received-SPF: pass (google.com: domain of linux-kernel+bounces-201138-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Message-ID: <2a38e355-af5c-4b3d-81be-0cc97376c1f5@fintech.ru>
Date: Tue, 4 Jun 2024 10:09:43 -0700
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH] HID: usbhid: fix recurrent out-of-bounds bug in
 usbhid_parse()
To: Jiri Kosina <jikos@kernel.org>, Kees Cook <kees@kernel.org>
CC: Benjamin Tissoires <bentiss@kernel.org>, Kees Cook
	<keescook@chromium.org>, <linux-usb@vger.kernel.org>,
	<linux-input@vger.kernel.org>, <syzkaller-bugs@googlegroups.com>,
	<linux-kernel@vger.kernel.org>,
	<syzbot+c52569baf0c843f35495@syzkaller.appspotmail.com>,
	<linux-hardening@vger.kernel.org>
References: <20240524120112.28076-1-n.zhandarovich@fintech.ru>
 <nycvar.YFH.7.76.2406041015210.16865@cbobk.fhfr.pm>
 <E62FA5CB-D7AE-4A11-9D2E-7D78D7C10ADA@kernel.org>
 <nycvar.YFH.7.76.2406041614210.24940@cbobk.fhfr.pm>
Content-Language: en-US
From: Nikita Zhandarovich <n.zhandarovich@fintech.ru>
In-Reply-To: <nycvar.YFH.7.76.2406041614210.24940@cbobk.fhfr.pm>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit

Hi,

On 6/4/24 07:15, Jiri Kosina wrote:
> On Tue, 4 Jun 2024, Kees Cook wrote:
> 
>> This isn't the right solution. The problem is that hid_class_descriptor 
>> is a flexible array but was sized as a single element fake flexible 
>> array:
>>
>> struct hid_descriptor {
>> 	   __u8  bLength;
>> 	   __u8  bDescriptorType;
>> 	   __le16 bcdHID;
>> 	   __u8  bCountryCode;
>> 	   __u8  bNumDescriptors;
>>
>> 	   struct hid_class_descriptor desc[1];
>> } __attribute__ ((packed));
>>
>> This likely needs to be: 
>>
>> struct hid_class_descriptor desc[] __counted_by(bNumDescriptors);
>>
>> And then check for any sizeof() uses of the struct that might have changed.
> 
> Ah, you are of course right, not sure what I was thinking. Thanks a lot 
> for catching my brainfart.
> 
> I am dropping the patch for now; Nikita, will you please send a refreshed 
> one?
> 

Thanks for catching my mistake.

I'll gladly send a revised version, hoping to do it very soon.

Regards,
Nikita