Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-29 17:31:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[USBHUB_NEW][USBPORT] Fix buffer size calculation for multi-sz values in IRP_MN_QUERY_ID.

Browse source 
Also fix some copypasta'd DPRINTs.
This commit is contained in:
Vadim Galyant 2018-09-08 20:52:06 +02:00 committed by Thomas Faber
parent a9da3c50be
commit 3baf43c5de
No known key found for this signature in database
GPG key ID: 076E7C3D44720826
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/usb/usbhub_new/pnp.c
View file

@ -1649,7 +1649,7 @@ USBH_PdoQueryId(IN PUSBHUB_PORT_PDO_EXTENSION PortExtension,
DeviceDescriptor->idProduct);
}
Length = sizeof(Buffer) - (Remaining - sizeof(UNICODE_NULL));
Length = sizeof(Buffer) - (Remaining - 2 * sizeof(UNICODE_NULL));
Id = ExAllocatePoolWithTag(PagedPool, Length, USB_HUB_TAG);
@ -1662,7 +1662,7 @@ USBH_PdoQueryId(IN PUSBHUB_PORT_PDO_EXTENSION PortExtension,
if (PortExtension->PortPdoFlags & USBHUB_PDO_FLAG_INIT_PORT_FAILED)
{
DPRINT("USBH_PdoQueryId: BusQueryInstanceID - %S\n", Id);
DPRINT("USBH_PdoQueryId: BusQueryHardwareID - %S\n", Id);
}
else
{
@ -1766,7 +1766,7 @@ USBH_PdoQueryId(IN PUSBHUB_PORT_PDO_EXTENSION PortExtension,
InterfaceDescriptor->bInterfaceClass);
}
Length = sizeof(Buffer) - (Remaining - sizeof(UNICODE_NULL));
Length = sizeof(Buffer) - (Remaining - 2 * sizeof(UNICODE_NULL));
Id = ExAllocatePoolWithTag(PagedPool, Length, USB_HUB_TAG);
@ -1779,7 +1779,7 @@ USBH_PdoQueryId(IN PUSBHUB_PORT_PDO_EXTENSION PortExtension,
if (PortExtension->PortPdoFlags & USBHUB_PDO_FLAG_INIT_PORT_FAILED)
{
DPRINT("USBH_PdoQueryId: BusQueryInstanceID - %S\n", Id);
DPRINT("USBH_PdoQueryId: BusQueryCompatibleID - %S\n", Id);
}
else
{

2
drivers/usb/usbport/pnp.c
View file

@ -1493,7 +1493,7 @@ USBPORT_GetDeviceHwIds(IN PDEVICE_OBJECT FdoDevice,
L"USB\\ROOT_HUB");
}
Length = (sizeof(Buffer) - Remaining + sizeof(UNICODE_NULL));
Length = (sizeof(Buffer) - Remaining + 2 * sizeof(UNICODE_NULL));
/* for debug only */
if (FALSE)