system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-01 12:47:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

mountmgr: Validate the output size for IOCTL_MOUNTMGR_QUERY_POINTS.

Browse source 
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-08-30 22:25:57 -05:00 committed by Alexandre Julliard
parent c342afeff8
commit 17ebac8482
2 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dlls/kernel32/tests/volume.c
View file

@ -1658,7 +1658,7 @@ static void test_mountmgr_query_points(void)
io.Information = 0xdeadf00d; io.Information = 0xdeadf00d;
status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io, status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io,
IOCTL_MOUNTMGR_QUERY_POINTS, input, sizeof(*input), NULL, 0 ); IOCTL_MOUNTMGR_QUERY_POINTS, input, sizeof(*input), NULL, 0 );
todo_wine ok(status == STATUS_INVALID_PARAMETER, "got %#x\n", status); ok(status == STATUS_INVALID_PARAMETER, "got %#x\n", status);
todo_wine ok(io.Status == 0xdeadf00d, "got status %#x\n", io.Status); todo_wine ok(io.Status == 0xdeadf00d, "got status %#x\n", io.Status);
todo_wine ok(io.Information == 0xdeadf00d, "got information %#Ix\n", io.Information); todo_wine ok(io.Information == 0xdeadf00d, "got information %#Ix\n", io.Information);
@ -1667,10 +1667,10 @@ static void test_mountmgr_query_points(void)
memset(output, 0xcc, sizeof(*output)); memset(output, 0xcc, sizeof(*output));
status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io, status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io,
IOCTL_MOUNTMGR_QUERY_POINTS, input, sizeof(*input), output, sizeof(*output) - 1 ); IOCTL_MOUNTMGR_QUERY_POINTS, input, sizeof(*input), output, sizeof(*output) - 1 );
todo_wine ok(status == STATUS_INVALID_PARAMETER, "got %#x\n", status); ok(status == STATUS_INVALID_PARAMETER, "got %#x\n", status);
todo_wine ok(io.Status == 0xdeadf00d, "got status %#x\n", io.Status); todo_wine ok(io.Status == 0xdeadf00d, "got status %#x\n", io.Status);
todo_wine ok(io.Information == 0xdeadf00d, "got information %#Ix\n", io.Information); todo_wine ok(io.Information == 0xdeadf00d, "got information %#Ix\n", io.Information);
todo_wine ok(output->Size == 0xcccccccc, "got size %u\n", output->Size); ok(output->Size == 0xcccccccc, "got size %u\n", output->Size);
ok(output->NumberOfMountPoints == 0xcccccccc, "got count %u\n", output->NumberOfMountPoints); ok(output->NumberOfMountPoints == 0xcccccccc, "got count %u\n", output->NumberOfMountPoints);
io.Status = 0xdeadf00d; io.Status = 0xdeadf00d;

12
dlls/mountmgr.sys/mountmgr.c
View file

@ -168,8 +168,9 @@ static NTSTATUS query_mount_points( void *buff, SIZE_T insize,
MOUNTMGR_MOUNT_POINTS *info; MOUNTMGR_MOUNT_POINTS *info;
struct mount_point *mount; struct mount_point *mount;
/* sanity checks */ if (insize < sizeof(*input) ||
if (input->SymbolicLinkNameOffset + input->SymbolicLinkNameLength > insize || outsize < sizeof(*info) ||
input->SymbolicLinkNameOffset + input->SymbolicLinkNameLength > insize ||
input->UniqueIdOffset + input->UniqueIdLength > insize || input->UniqueIdOffset + input->UniqueIdLength > insize ||
input->DeviceNameOffset + input->DeviceNameLength > insize || input->DeviceNameOffset + input->DeviceNameLength > insize ||
input->SymbolicLinkNameOffset + input->SymbolicLinkNameLength < input->SymbolicLinkNameOffset || input->SymbolicLinkNameOffset + input->SymbolicLinkNameLength < input->SymbolicLinkNameOffset ||
@ -193,7 +194,7 @@ static NTSTATUS query_mount_points( void *buff, SIZE_T insize,
if (size > outsize) if (size > outsize)
{ {
info = buff; info = buff;
if (size >= sizeof(info->Size)) info->Size = size; info->Size = size;
iosb->Information = sizeof(info->Size); iosb->Information = sizeof(info->Size);
return STATUS_MORE_ENTRIES; return STATUS_MORE_ENTRIES;
} }
@ -907,11 +908,6 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp )
switch(irpsp->Parameters.DeviceIoControl.IoControlCode) switch(irpsp->Parameters.DeviceIoControl.IoControlCode)
{ {
case IOCTL_MOUNTMGR_QUERY_POINTS: case IOCTL_MOUNTMGR_QUERY_POINTS:
if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(MOUNTMGR_MOUNT_POINT))
{
status = STATUS_INVALID_PARAMETER;
break;
}
status = query_mount_points( irp->AssociatedIrp.SystemBuffer, status = query_mount_points( irp->AssociatedIrp.SystemBuffer,
irpsp->Parameters.DeviceIoControl.InputBufferLength, irpsp->Parameters.DeviceIoControl.InputBufferLength,
irpsp->Parameters.DeviceIoControl.OutputBufferLength, irpsp->Parameters.DeviceIoControl.OutputBufferLength,