lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <alpine.LNX.2.00.1212061054270.28002@pobox.suse.cz> Date: Thu, 6 Dec 2012 10:54:34 +0100 (CET) From: Jiri Kosina <jkosina@...e.cz> To: Jean Delvare <khali@...ux-fr.org> Cc: Benjamin Tissoires <benjamin.tissoires@...il.com>, linux-input@...r.kernel.org, linux-i2c@...r.kernel.org, linux-kernel@...r.kernel.org Subject: Re: [PATCH v2 1/4] HID: i2c-hid: fix memory corruption due to missing hid declaration On Wed, 5 Dec 2012, Jean Delvare wrote: > > HID descriptors contains 4 bytes of reserved field. > > The previous implementation was overriding the next fields in struct i2c_hid. > > > > Signed-off-by: Benjamin Tissoires <benjamin.tissoires@...il.com> > > --- > > drivers/hid/i2c-hid/i2c-hid.c | 9 ++++++++- > > 1 file changed, 8 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c > > index 7062df2..34cca42 100644 > > --- a/drivers/hid/i2c-hid/i2c-hid.c > > +++ b/drivers/hid/i2c-hid/i2c-hid.c > > @@ -69,6 +69,7 @@ struct i2c_hid_desc { > > __le16 wVendorID; > > __le16 wProductID; > > __le16 wVersionID; > > + __le32 reserved; > > } __packed; > > > > struct i2c_hid_cmd { > > @@ -776,7 +777,13 @@ static int __devinit i2c_hid_fetch_hid_descriptor(struct i2c_hid *ihid) > > } > > > > dsize = le16_to_cpu(hdesc->wHIDDescLength); > > - if (!dsize || dsize > HID_MAX_DESCRIPTOR_SIZE) { > > + /* > > + * the size of the HID descriptor should at least contain > > + * its size and the bcdVersion (4 bytes), and should not be greater > > + * than sizeof(struct i2c_hid_desc) as we directly fill this struct > > + * through i2c_hid_command. > > + */ > > + if (dsize < 4 || dsize > sizeof(struct i2c_hid_desc)) { > > dev_err(&client->dev, "weird size of HID descriptor (%u)\n", > > dsize); > > return -ENODEV; > > Reviewed-by: Jean Delvare <khali@...ux-fr.org> Applied, thanks. -- Jiri Kosina SUSE Labs -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists