Received-SPF: pass (google.com: domain of linux-kernel+bounces-200793-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Tue, 4 Jun 2024 16:15:18 +0200 (CEST)
From: Jiri Kosina <jikos@kernel.org>
To: Kees Cook <kees@kernel.org>
cc: Nikita Zhandarovich <n.zhandarovich@fintech.ru>, 
    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
Subject: Re: [PATCH] HID: usbhid: fix recurrent out-of-bounds bug in
 usbhid_parse()
In-Reply-To: <E62FA5CB-D7AE-4A11-9D2E-7D78D7C10ADA@kernel.org>
Message-ID: <nycvar.YFH.7.76.2406041614210.24940@cbobk.fhfr.pm>
References: <20240524120112.28076-1-n.zhandarovich@fintech.ru> <nycvar.YFH.7.76.2406041015210.16865@cbobk.fhfr.pm> <E62FA5CB-D7AE-4A11-9D2E-7D78D7C10ADA@kernel.org>
User-Agent: Alpine 2.21 (LSU 202 2017-01-01)
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII

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?

-- 
Jiri Kosina
SUSE Labs