Ros-diffs October 2017

ros-diffs@reactos.org

43 participants
275 discussions

[reactos] 01/01: [KERNEL32] Use proper size for allocating buffer in GetVolumeInformationA(). This was leading to allocate a too small buffer under certain conditions and to overrun it. This fixes JRE7 setup. This regression was brought in by r75969.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dc8bfeabcffeaf2bcdc69… commit dc8bfeabcffeaf2bcdc6907af1313e7a7866314e Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Oct 14 23:19:12 2017 +0200 [KERNEL32] Use proper size for allocating buffer in GetVolumeInformationA(). This was leading to allocate a too small buffer under certain conditions and to overrun it. This fixes JRE7 setup. This regression was brought in by r75969. CORE-13888 --- dll/win32/kernel32/client/file/volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/kernel32/client/file/volume.c b/dll/win32/kernel32/client/file/volume.c index e59c291b67..90016b8e08 100644 --- a/dll/win32/kernel32/client/file/volume.c +++ b/dll/win32/kernel32/client/file/volume.c @@ -87,7 +87,7 @@ GetVolumeInformationA(IN LPCSTR lpRootPathName, /* If caller wants file system name, allocate a buffer to receive it */ if (lpFileSystemNameBuffer != NULL) { - FileSystemNameU.MaximumLength = sizeof(WCHAR) * (nVolumeNameSize + 1); + FileSystemNameU.MaximumLength = sizeof(WCHAR) * (nFileSystemNameSize + 1); FileSystemNameU.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, FileSystemNameU.MaximumLength); if (FileSystemNameU.Buffer == NULL)

7 years

[reactos] 01/01: [STORPORT] Initialize a miniport object and call the miniport HwFindAdapter and HwInitialize routines. CORE-13866

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8dea67f8ba2bd2b83afcd… commit 8dea67f8ba2bd2b83afcd40a4c53235be4596d37 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Oct 14 19:12:24 2017 +0200 [STORPORT] Initialize a miniport object and call the miniport HwFindAdapter and HwInitialize routines. CORE-13866 --- drivers/storage/port/storport/CMakeLists.txt | 2 + drivers/storage/port/storport/fdo.c | 80 +++++++++++++++++++++-- drivers/storage/port/storport/guid.c | 11 ++++ drivers/storage/port/storport/miniport.c | 93 ++++++++++++++++++++++++++ drivers/storage/port/storport/misc.c | 27 ++++++++ drivers/storage/port/storport/precomp.h | 51 ++++++++++++++- drivers/storage/port/storport/storport.c | 98 +++++++++++++++++++++++++++- drivers/storage/port/storport/storport.rc | 2 +- 8 files changed, 353 insertions(+), 11 deletions(-) diff --git a/drivers/storage/port/storport/CMakeLists.txt b/drivers/storage/port/storport/CMakeLists.txt index c531ee6f00..25b35a555d 100644 --- a/drivers/storage/port/storport/CMakeLists.txt +++ b/drivers/storage/port/storport/CMakeLists.txt @@ -3,6 +3,7 @@ spec2def(storport.sys storport.spec ADD_IMPORTLIB) list(APPEND SOURCE fdo.c + miniport.c misc.c pdo.c storport.c @@ -11,6 +12,7 @@ list(APPEND SOURCE add_library(storport SHARED ${SOURCE} + guid.c storport.rc ${CMAKE_CURRENT_BINARY_DIR}/storport.def) diff --git a/drivers/storage/port/storport/fdo.c b/drivers/storage/port/storport/fdo.c index c8508d0527..be6b693694 100644 --- a/drivers/storage/port/storport/fdo.c +++ b/drivers/storage/port/storport/fdo.c @@ -15,6 +15,53 @@ /* FUNCTIONS ******************************************************************/ +static +NTSTATUS +PortFdoStartMiniport( + _In_ PFDO_DEVICE_EXTENSION DeviceExtension) +{ + PHW_INITIALIZATION_DATA InitData; + INTERFACE_TYPE InterfaceType; + NTSTATUS Status; + + DPRINT1("PortFdoStartDevice(%p)\n", DeviceExtension); + + /* Get the interface type of the lower device */ + InterfaceType = GetBusInterface(DeviceExtension->LowerDevice); + if (InterfaceType == InterfaceTypeUndefined) + return STATUS_NO_SUCH_DEVICE; + + /* Get the driver init data for the given interface type */ + InitData = PortGetDriverInitData(DeviceExtension->DriverExtension, + InterfaceType); + if (InitData == NULL) + return STATUS_NO_SUCH_DEVICE; + + /* Initialize the miniport */ + MiniportInitialize(&DeviceExtension->Miniport, + DeviceExtension, + InitData); + + /* Call the miniports FindAdapter function */ + Status = MiniportFindAdapter(&DeviceExtension->Miniport); + if (!NT_SUCCESS(Status)) + { + DPRINT1("MiniportFindAdapter() failed (Status 0x%08lx)\n", Status); + return Status; + } + + /* Call the miniports HwInitialize function */ + Status = MiniportHwInitialize(&DeviceExtension->Miniport); + if (!NT_SUCCESS(Status)) + { + DPRINT1("MiniportHwInitialize() failed (Status 0x%08lx)\n", Status); + return Status; + } + + return STATUS_SUCCESS; +} + + static NTSTATUS NTAPI @@ -22,12 +69,36 @@ PortFdoStartDevice( _In_ PFDO_DEVICE_EXTENSION DeviceExtension, _In_ PIRP Irp) { + NTSTATUS Status; + DPRINT1("PortFdoStartDevice(%p %p)\n", DeviceExtension, Irp); ASSERT(DeviceExtension->ExtensionType == FdoExtension); - return STATUS_SUCCESS; + /* Start the lower device if the FDO is in 'stopped' state */ + if (DeviceExtension->PnpState == dsStopped) + { + Status = ForwardIrpAndWait(DeviceExtension->LowerDevice, Irp); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ForwardIrpAndWait() failed (Status 0x%08lx)\n", Status); + return Status; + } + } + + /* Change to the 'started' state */ + DeviceExtension->PnpState = dsStarted; + + /* Start the miniport (FindAdapter & Initialize) */ + Status = PortFdoStartMiniport(DeviceExtension); + if (!NT_SUCCESS(Status)) + { + DPRINT1("FdoStartMiniport() failed (Status 0x%08lx)\n", Status); + DeviceExtension->PnpState = dsStopped; + } + + return Status; } @@ -72,12 +143,7 @@ PortFdoPnp( { case IRP_MN_START_DEVICE: /* 0x00 */ DPRINT1("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); - /* Call lower driver */ - Status = ForwardIrpAndWait(DeviceExtension->LowerDevice, Irp); - if (NT_SUCCESS(Status)) - { - Status = PortFdoStartDevice(DeviceExtension, Irp); - } + Status = PortFdoStartDevice(DeviceExtension, Irp); break; case IRP_MN_QUERY_REMOVE_DEVICE: /* 0x01 */ diff --git a/drivers/storage/port/storport/guid.c b/drivers/storage/port/storport/guid.c new file mode 100644 index 0000000000..757901b422 --- /dev/null +++ b/drivers/storage/port/storport/guid.c @@ -0,0 +1,11 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <ntdef.h> +#include <initguid.h> +#include <ioevent.h> +#include <wdmguid.h> + +#define DEVICE_TYPE ULONG +#include <ntddstor.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ diff --git a/drivers/storage/port/storport/miniport.c b/drivers/storage/port/storport/miniport.c new file mode 100644 index 0000000000..8e1346fe8b --- /dev/null +++ b/drivers/storage/port/storport/miniport.c @@ -0,0 +1,93 @@ +/* + * PROJECT: ReactOS Storport Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Miniport interface code + * COPYRIGHT: Copyright 2017 Eric Kohl (eric.kohl(a)reactos.org) + */ + +/* INCLUDES *******************************************************************/ + +#include "precomp.h" + +#define NDEBUG +#include <debug.h> + + +/* FUNCTIONS ******************************************************************/ + +VOID +MiniportInitialize( + _In_ PMINIPORT Miniport, + _In_ PFDO_DEVICE_EXTENSION DeviceExtension, + _In_ PHW_INITIALIZATION_DATA InitData) +{ + Miniport->DeviceExtension = DeviceExtension; + Miniport->InitData = InitData; +} + + +NTSTATUS +MiniportFindAdapter( + _In_ PMINIPORT Miniport) +{ + BOOLEAN Reserved = FALSE; + ULONG Result; + NTSTATUS Status; + + DPRINT1("MiniportFindAdapter(%p)\n", Miniport); + + Result = Miniport->InitData->HwFindAdapter(NULL, + NULL, + NULL, + NULL, + NULL, + &Reserved); + DPRINT1("HwFindAdapter() returned %lu\n", Result); + + switch (Result) + { + case SP_RETURN_NOT_FOUND: + DPRINT1("SP_RETURN_NOT_FOUND\n"); + Status = STATUS_NOT_FOUND; + break; + + case SP_RETURN_FOUND: + DPRINT1("SP_RETURN_FOUND\n"); + Status = STATUS_SUCCESS; + break; + + case SP_RETURN_ERROR: + DPRINT1("SP_RETURN_ERROR\n"); + Status = STATUS_ADAPTER_HARDWARE_ERROR; + break; + + case SP_RETURN_BAD_CONFIG: + DPRINT1("SP_RETURN_BAD_CONFIG\n"); + Status = STATUS_DEVICE_CONFIGURATION_ERROR; + break; + + default: + DPRINT1("Unknown result: %lu\n", Result); + Status = STATUS_INTERNAL_ERROR; + break; + } + + return Status; +} + + +NTSTATUS +MiniportHwInitialize( + _In_ PMINIPORT Miniport) +{ + NTSTATUS Status; + + DPRINT1("MiniportHwInitialize(%p)\n", Miniport); + + Status = Miniport->InitData->HwInitialize(NULL); + DPRINT1("HwInitialize() returned 0x%08lx\n", Status); + + return Status; +} + +/* EOF */ diff --git a/drivers/storage/port/storport/misc.c b/drivers/storage/port/storport/misc.c index 3f2e254aa1..54832c48aa 100644 --- a/drivers/storage/port/storport/misc.c +++ b/drivers/storage/port/storport/misc.c @@ -68,4 +68,31 @@ ForwardIrpAndForget( return IoCallDriver(LowerDevice, Irp); } + +INTERFACE_TYPE +GetBusInterface( + PDEVICE_OBJECT DeviceObject) +{ + GUID Guid; + ULONG Length; + NTSTATUS Status; + + Status = IoGetDeviceProperty(DeviceObject, + DevicePropertyBusTypeGuid, + sizeof(Guid), + &Guid, + &Length); + if (!NT_SUCCESS(Status)) + return InterfaceTypeUndefined; + + if (RtlCompareMemory(&Guid, &GUID_BUS_TYPE_PCMCIA, sizeof(GUID)) == sizeof(GUID)) + return PCMCIABus; + else if (RtlCompareMemory(&Guid, &GUID_BUS_TYPE_PCI, sizeof(GUID)) == sizeof(GUID)) + return PCIBus; + else if (RtlCompareMemory(&Guid, &GUID_BUS_TYPE_ISAPNP, sizeof(GUID)) == sizeof(GUID)) + return PNPISABus; + + return InterfaceTypeUndefined; +} + /* EOF */ diff --git a/drivers/storage/port/storport/precomp.h b/drivers/storage/port/storport/precomp.h index 68c59ba339..fc1224e851 100644 --- a/drivers/storage/port/storport/precomp.h +++ b/drivers/storage/port/storport/precomp.h @@ -11,6 +11,7 @@ #include <wdm.h> #include <ntddk.h> #include <stdio.h> +#include <memory.h> /* Declare STORPORT_API functions as exports rather than imports */ #define _STORPORT_ @@ -19,6 +20,11 @@ #include <ntddscsi.h> #include <ntdddisk.h> #include <mountdev.h> +#include <wdmguid.h> + +/* Memory Tags */ +#define TAG_GLOBAL_DATA 'DGtS' +#define TAG_INIT_DATA 'DItS' typedef enum { @@ -37,18 +43,30 @@ typedef enum PdoExtension } EXTENSION_TYPE; +typedef struct _DRIVER_INIT_DATA +{ + LIST_ENTRY Entry; + HW_INITIALIZATION_DATA HwInitData; +} DRIVER_INIT_DATA, *PDRIVER_INIT_DATA; + typedef struct _DRIVER_OBJECT_EXTENSION { EXTENSION_TYPE ExtensionType; - PDRIVER_OBJECT DriverObject; KSPIN_LOCK AdapterListLock; LIST_ENTRY AdapterListHead; ULONG AdapterCount; + LIST_ENTRY InitDataListHead; } DRIVER_OBJECT_EXTENSION, *PDRIVER_OBJECT_EXTENSION; +typedef struct _MINIPORT +{ + struct _FDO_DEVICE_EXTENSION *DeviceExtension; + PHW_INITIALIZATION_DATA InitData; +} MINIPORT, *PMINIPORT; + typedef struct _FDO_DEVICE_EXTENSION { EXTENSION_TYPE ExtensionType; @@ -57,9 +75,13 @@ typedef struct _FDO_DEVICE_EXTENSION PDEVICE_OBJECT LowerDevice; PDEVICE_OBJECT PhysicalDevice; - DEVICE_STATE PnpState; + PDRIVER_OBJECT_EXTENSION DriverExtension; + DEVICE_STATE PnpState; LIST_ENTRY AdapterListEntry; + + MINIPORT Miniport; + } FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION; @@ -83,6 +105,23 @@ PortFdoPnp( _In_ PIRP Irp); +/* miniport.c */ + +VOID +MiniportInitialize( + _In_ PMINIPORT Miniport, + _In_ PFDO_DEVICE_EXTENSION DeviceExtension, + _In_ PHW_INITIALIZATION_DATA HwInitializationData); + +NTSTATUS +MiniportFindAdapter( + _In_ PMINIPORT Miniport); + +NTSTATUS +MiniportHwInitialize( + _In_ PMINIPORT Miniport); + + /* misc.c */ NTSTATUS @@ -96,6 +135,9 @@ ForwardIrpAndForget( _In_ PDEVICE_OBJECT LowerDevice, _In_ PIRP Irp); +INTERFACE_TYPE +GetBusInterface( + PDEVICE_OBJECT DeviceObject); /* pdo.c */ @@ -108,6 +150,11 @@ PortPdoPnp( /* storport.c */ +PHW_INITIALIZATION_DATA +PortGetDriverInitData( + PDRIVER_OBJECT_EXTENSION DriverExtension, + INTERFACE_TYPE InterfaceType); + NTSTATUS NTAPI DriverEntry( diff --git a/drivers/storage/port/storport/storport.c b/drivers/storage/port/storport/storport.c index 9b227dd834..3520bbf3a3 100644 --- a/drivers/storage/port/storport/storport.c +++ b/drivers/storage/port/storport/storport.c @@ -20,6 +20,86 @@ ULONG PortNumber = 0; /* FUNCTIONS ******************************************************************/ +static +NTSTATUS +PortAddDriverInitData( + PDRIVER_OBJECT_EXTENSION DriverExtension, + PHW_INITIALIZATION_DATA HwInitializationData) +{ + PDRIVER_INIT_DATA InitData; + + DPRINT1("PortAddDriverInitData()\n"); + + InitData = ExAllocatePoolWithTag(NonPagedPool, + sizeof(DRIVER_INIT_DATA), + TAG_INIT_DATA); + if (InitData == NULL) + return STATUS_NO_MEMORY; + + RtlCopyMemory(&InitData->HwInitData, + HwInitializationData, + sizeof(HW_INITIALIZATION_DATA)); + + InsertHeadList(&DriverExtension->InitDataListHead, + &InitData->Entry); + + return STATUS_SUCCESS; +} + + +static +VOID +PortDeleteDriverInitData( + PDRIVER_OBJECT_EXTENSION DriverExtension) +{ + PDRIVER_INIT_DATA InitData; + PLIST_ENTRY ListEntry; + + DPRINT1("PortDeleteDriverInitData()\n"); + + ListEntry = DriverExtension->InitDataListHead.Flink; + while (ListEntry != &DriverExtension->InitDataListHead) + { + InitData = CONTAINING_RECORD(ListEntry, + DRIVER_INIT_DATA, + Entry); + + RemoveEntryList(&InitData->Entry); + + ExFreePoolWithTag(InitData, + TAG_INIT_DATA); + + ListEntry = DriverExtension->InitDataListHead.Flink; + } +} + + +PHW_INITIALIZATION_DATA +PortGetDriverInitData( + PDRIVER_OBJECT_EXTENSION DriverExtension, + INTERFACE_TYPE InterfaceType) +{ + PDRIVER_INIT_DATA InitData; + PLIST_ENTRY ListEntry; + + DPRINT1("PortGetDriverInitData()\n"); + + ListEntry = DriverExtension->InitDataListHead.Flink; + while (ListEntry != &DriverExtension->InitDataListHead) + { + InitData = CONTAINING_RECORD(ListEntry, + DRIVER_INIT_DATA, + Entry); + if (InitData->HwInitData.AdapterInterfaceType == InterfaceType) + return &InitData->HwInitData; + + ListEntry = ListEntry->Flink; + } + + return NULL; +} + + static NTSTATUS NTAPI @@ -96,6 +176,8 @@ PortAddDevice( (PVOID)DriverEntry); ASSERT(DriverObjectExtension->ExtensionType == DriverExtension); + DeviceExtension->DriverExtension = DriverObjectExtension; + KeAcquireInStackQueuedSpinLock(&DriverObjectExtension->AdapterListLock, &LockHandle); @@ -120,8 +202,17 @@ NTAPI PortUnload( _In_ PDRIVER_OBJECT DriverObject) { + PDRIVER_OBJECT_EXTENSION DriverExtension; + DPRINT1("PortUnload(%p)\n", DriverObject); + + DriverExtension = IoGetDriverObjectExtension(DriverObject, + (PVOID)DriverEntry); + if (DriverExtension != NULL) + { + PortDeleteDriverInitData(DriverExtension); + } } @@ -138,7 +229,7 @@ PortDispatchCreate( Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = FILE_OPENED; - IoCompleteRequest( Irp, IO_NO_INCREMENT ); + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } @@ -690,6 +781,7 @@ StorPortInitialize( InitializeListHead(&DriverObjectExtension->AdapterListHead); KeInitializeSpinLock(&DriverObjectExtension->AdapterListLock); + InitializeListHead(&DriverObjectExtension->InitDataListHead); /* Set handlers */ DriverObject->DriverExtension->AddDevice = PortAddDevice; @@ -704,6 +796,10 @@ StorPortInitialize( DriverObject->MajorFunction[IRP_MJ_PNP] = PortDispatchPnp; } + /* Add the initialzation data to the driver extension */ + Status = PortAddDriverInitData(DriverObjectExtension, + HwInitializationData); + DPRINT1("StorPortInitialize() done (Status 0x%08lx)\n", Status); return Status; diff --git a/drivers/storage/port/storport/storport.rc b/drivers/storage/port/storport/storport.rc index ec00692e01..1b3f70bf9e 100644 --- a/drivers/storage/port/storport/storport.rc +++ b/drivers/storage/port/storport/storport.rc @@ -2,4 +2,4 @@ #define REACTOS_STR_FILE_DESCRIPTION "Storport Driver" #define REACTOS_STR_INTERNAL_NAME "storport" #define REACTOS_STR_ORIGINAL_FILENAME "storport.sys" -#include <reactos/version.rc> \ No newline at end of file +#include <reactos/version.rc>

7 years

[reactos] 01/01: [EXPLORER] Remove an unnecessary refresh of the rebar and its bands.

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da5b61f32fe6ef332fa22… commit da5b61f32fe6ef332fa226bf1653cd12e08dc64f Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sat Oct 14 18:36:02 2017 +0300 [EXPLORER] Remove an unnecessary refresh of the rebar and its bands. --- base/shell/explorer/traywnd.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index d15eabfac3..f9d1f2ae39 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -1532,13 +1532,6 @@ ChangePos: Horizontal = IsPosHorizontal(); - IUnknown_Exec(m_TrayBandSite, - IID_IDeskBand, - DBID_BANDINFOCHANGED, - 0, - NULL, - NULL); - /* We're about to resize/move the start button, the rebar control and the tray notification control */ dwp = BeginDeferWindowPos(3);

7 years

[reactos] 01/01: [BOOTDATA]: Add the storport and storahci to the boot configuration. Enable 'PCI\CC_0106 = storahci' and disable 'PCI\CC_0106 = uniata' in order to enable the storahci driver for AHCI controllers.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=804092f41b7661f7d44f5… commit 804092f41b7661f7d44f562922088c738c5e8afa Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Oct 14 00:22:36 2017 +0200 [BOOTDATA]: Add the storport and storahci to the boot configuration. Enable 'PCI\CC_0106 = storahci' and disable 'PCI\CC_0106 = uniata' in order to enable the storahci driver for AHCI controllers. --- boot/bootdata/txtsetup.sif | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index 5e0d553392..3ea62974b5 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -24,6 +24,7 @@ nmidebug.sys=,,,,,,x,,,,,,4 sacdrv.sys=,,,,,,x,,,,,,4 uniata.sys=,,,,,,x,,,,,,4 buslogic.sys=,,,,,,x,,,,,,4 +storahci.sys=,,,,,,x,,,,,,4 blue.sys=,,,,,,x,,,,,,4 vgafonts.cab=,,,,,,,,,,,,1 bootvid.dll=,,,,,,,,,,,,2 @@ -54,6 +55,7 @@ l_intl.nls=,,,,,,,,,,,,2 ntfs.sys=,,,,,,,,,,,,4 pci.sys=,,,,,,,,,,,,4 scsiport.sys=,,,,,,x,,,,,,4 +storport.sys=,,,,,,x,,,,,,4 fastfat.sys=,,,,,,x,,,,,,4 ramdisk.sys=,,,,,,x,,,,,,4 ext2fs.sys=,,,,,,x,,,,,,4 @@ -86,6 +88,7 @@ PCI\CC_0101 = pciide PCI\CC_0104 = uniata PCI\CC_0105 = uniata PCI\CC_0106 = uniata +;PCI\CC_0106 = storahci *PNP0600 = uniata ;USB\CLASS_09 = usbhub USB\ROOT_HUB = usbhub @@ -126,6 +129,7 @@ pciide = pciide.sys [SCSI.Load] uniata = uniata.sys buslogic = buslogic.sys +storahci = storahci.sys disk = disk.sys [Cabinets]

7 years

[reactos] 05/05: [USBPORT] Avoid more integer overflows.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf74391dcda6c76fd0bbb… commit bf74391dcda6c76fd0bbb4e77431d933384487fe Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Oct 11 20:05:55 2017 +0200 [USBPORT] Avoid more integer overflows. --- drivers/usb/usbport/device.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/usb/usbport/device.c b/drivers/usb/usbport/device.c index 0a14bf8961..b9063a70bd 100644 --- a/drivers/usb/usbport/device.c +++ b/drivers/usb/usbport/device.c @@ -275,8 +275,8 @@ USBPORT_OpenInterface(IN PURB Urb, NumEndpoints = InterfaceDescriptor->bNumEndpoints; - Length = sizeof(USBD_INTERFACE_INFORMATION) + - (NumEndpoints - 1) * sizeof(USBD_PIPE_INFORMATION); + Length = FIELD_OFFSET(USBD_INTERFACE_INFORMATION, Pipes) + + NumEndpoints * sizeof(USBD_PIPE_INFORMATION); if (InterfaceInfo->AlternateSetting && IsSetInterface) { @@ -289,8 +289,8 @@ USBPORT_OpenInterface(IN PURB Urb, } else { - HandleLength = sizeof(USBPORT_INTERFACE_HANDLE) + - (NumEndpoints - 1) * sizeof(USBPORT_PIPE_HANDLE); + HandleLength = FIELD_OFFSET(USBPORT_INTERFACE_HANDLE, PipeHandle) + + NumEndpoints * sizeof(USBPORT_PIPE_HANDLE); InterfaceHandle = ExAllocatePoolWithTag(NonPagedPool, HandleLength, @@ -500,8 +500,8 @@ USBPORT_InitInterfaceInfo(IN PUSBD_INTERFACE_INFORMATION InterfaceInfo, { NumberOfPipes = Descriptor->bNumEndpoints; - Length = sizeof(USBD_INTERFACE_INFORMATION) + - (NumberOfPipes - 1) * sizeof(USBD_PIPE_INFORMATION); + Length = FIELD_OFFSET(USBD_INTERFACE_INFORMATION, Pipes) + + NumberOfPipes * sizeof(USBD_PIPE_INFORMATION); if (InterfaceInfo->Length >= Length) {

7 years

[reactos] 04/05: [USBPORT] Avoid a benign integer overflow in USBHI_QueryDeviceInformation (CID 1419219).

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a45779a12f70f3c43a5b7… commit a45779a12f70f3c43a5b78c7bdf3478c71accccb Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Oct 11 17:59:43 2017 +0200 [USBPORT] Avoid a benign integer overflow in USBHI_QueryDeviceInformation (CID 1419219). --- drivers/usb/usbport/iface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/usbport/iface.c b/drivers/usb/usbport/iface.c index 39f42e77ba..4e56811eb7 100644 --- a/drivers/usb/usbport/iface.c +++ b/drivers/usb/usbport/iface.c @@ -211,8 +211,8 @@ USBHI_QueryDeviceInformation(IN PVOID BusContext, } } - ActualLength = sizeof(USB_DEVICE_INFORMATION_0) + - (NumberOfOpenPipes - 1) * sizeof(USB_PIPE_INFORMATION_0); + ActualLength = FIELD_OFFSET(USB_DEVICE_INFORMATION_0, PipeList) + + NumberOfOpenPipes * sizeof(USB_PIPE_INFORMATION_0); if (DeviceInfoBufferLen < ActualLength) {

7 years

[reactos] 03/05: [USBPORT] Remove unnecessary null check in USBPORT_HandleSubmitURB (CID 1419367).

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=45741cdf3a94817a5c651… commit 45741cdf3a94817a5c6515df5eac4a7417d6938d Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Oct 11 17:15:46 2017 +0200 [USBPORT] Remove unnecessary null check in USBPORT_HandleSubmitURB (CID 1419367). --- drivers/usb/usbport/urb.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/usb/usbport/urb.c b/drivers/usb/usbport/urb.c index a9d7d07977..079206896b 100644 --- a/drivers/usb/usbport/urb.c +++ b/drivers/usb/usbport/urb.c @@ -1056,10 +1056,7 @@ USBPORT_HandleSubmitURB(IN PDEVICE_OBJECT PdoDevice, ExFreePoolWithTag(Transfer, USB_PORT_TAG); } - if (DeviceHandle) - { - InterlockedDecrement(&DeviceHandle->DeviceHandleLock); - } + InterlockedDecrement(&DeviceHandle->DeviceHandleLock); Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT);

7 years

[reactos] 02/05: [USBPORT] Fix ControllerName leak in USBPORT_GetUnicodeName (CID 1419258).

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a237edf4bb5e0c0616ecd… commit a237edf4bb5e0c0616ecde8dfc32df8cd8c3a589 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Oct 11 00:32:05 2017 +0200 [USBPORT] Fix ControllerName leak in USBPORT_GetUnicodeName (CID 1419258). --- drivers/usb/usbport/ioctl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/usb/usbport/ioctl.c b/drivers/usb/usbport/ioctl.c index 7674391115..7322958889 100644 --- a/drivers/usb/usbport/ioctl.c +++ b/drivers/usb/usbport/ioctl.c @@ -276,6 +276,7 @@ USBPORT_GetUnicodeName(IN PDEVICE_OBJECT FdoDevice, if (ControllerName->Header.UsbUserStatusCode != UsbUserSuccess) { + ExFreePoolWithTag(ControllerName, USB_PORT_TAG); return STATUS_UNSUCCESSFUL; }

7 years

[reactos] 01/05: [USBPORT] Fix level check in USBDI_QueryBusInformation (CID 1419403).

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b5289a2f6e1359970938f… commit b5289a2f6e1359970938f0dc89e0bd3e946411d6 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Oct 11 00:24:29 2017 +0200 [USBPORT] Fix level check in USBDI_QueryBusInformation (CID 1419403). --- drivers/usb/usbport/iface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/usbport/iface.c b/drivers/usb/usbport/iface.c index 58a5d81a73..39f42e77ba 100644 --- a/drivers/usb/usbport/iface.c +++ b/drivers/usb/usbport/iface.c @@ -682,7 +682,7 @@ USBDI_QueryBusInformation(IN PVOID BusContext, DPRINT("USBDI_QueryBusInformation: Level - %p\n", Level); - if ((Level != 0) || (Level != 1)) + if ((Level != 0) && (Level != 1)) { DPRINT1("USBDI_QueryBusInformation: Level should be 0 or 1\n"); return STATUS_NOT_SUPPORTED;

7 years

[reactos] 01/01: [INTL]: Simplify code (addendum to r74582). (#41)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=41b94fd17b654326755c2… commit 41b94fd17b654326755c291aaad39eb400975337 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Oct 13 22:24:37 2017 +0200 [INTL]: Simplify code (addendum to r74582). (#41) CORE-13242 --- dll/cpl/intl/advanced.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dll/cpl/intl/advanced.c b/dll/cpl/intl/advanced.c index 3c9f51101f..0fddc82b5a 100644 --- a/dll/cpl/intl/advanced.c +++ b/dll/cpl/intl/advanced.c @@ -404,17 +404,14 @@ ListViewCustomDraw( case CDDS_ITEMPREPAINT: if (((PCPAGE)lplvcd->nmcd.lItemlParam)->Flags & CODEPAGE_NOT_REMOVEABLE) { - lplvcd->clrText = GetSysColor(COLOR_GRAYTEXT); - lplvcd->clrTextBk = GetSysColor(COLOR_WINDOW); - return CDRF_NEWFONT; + lplvcd->clrText = GetSysColor(COLOR_GRAYTEXT); } else { - lplvcd->clrText = GetSysColor(COLOR_WINDOWTEXT); - lplvcd->clrTextBk = GetSysColor(COLOR_WINDOW); - return CDRF_NEWFONT; + lplvcd->clrText = GetSysColor(COLOR_WINDOWTEXT); } - break; + lplvcd->clrTextBk = GetSysColor(COLOR_WINDOW); + return CDRF_NEWFONT; } return CDRF_DODEFAULT;

7 years

← Newer
1
...
13
14
15
16
17
18
19
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2017