Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c2b0216 authored by Alan Stern's avatar Alan Stern Committed by Sasha Levin
Browse files

USB: EHCI: declare hostpc register as zero-length array 



[ Upstream commit 7e8b3dfef16375dbfeb1f36a83eb9f27117c51fd ]

The HOSTPC extension registers found in some EHCI implementations form
a variable-length array, with one element for each port.  Therefore
the hostpc field in struct ehci_regs should be declared as a
zero-length array, not a single-element array.

This fixes a problem reported by UBSAN.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Reported-by: default avatarWilfried Klaebe <linux-kernel@lebenslange-mailadresse.de>
Tested-by: default avatarWilfried Klaebe <linux-kernel@lebenslange-mailadresse.de>
CC: <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 1f5d0686

include/linux/usb/ehci_def.h

+2 −2
Original line number Diff line number Diff line
@@ -178,11 +178,11 @@ struct ehci_regs { 
 * PORTSCx

 */

	/* HOSTPC: offset 0x84 */

	u32		hostpc[1];	/* HOSTPC extension */

	u32		hostpc[0];	/* HOSTPC extension */

#define HOSTPC_PHCD	(1<<22)		/* Phy clock disable */

#define HOSTPC_PSPD	(3<<25)		/* Port speed detection */



	u32		reserved5[16];

	u32		reserved5[17];



	/* USBMODE_EX: offset 0xc8 */

	u32		usbmode_ex;	/* USB Device mode extension */