Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[BATTC] Copy BATTERY_WAIT_STATUS structure to prevent memory overwrite.

Browse source 
At first QueryStatus call, output is written to Irp->AssociatedIrp.SystemBuffer.
Unfortunately, this is also the BattWait buffer.

At return of QueryStatus call, BattWait buffer has been modified, so
following code can't use it anymore.

Fix memory overwrite by copying BattWait buffer on the stack.
This commit is contained in:
Hervé Poussineau 2024-02-14 21:56:53 +01:00
parent 6f86c05cfb
commit 8612d6c0aa
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
drivers/battery/battc/battc.c
View file

@ -193,7 +193,7 @@ BatteryClassIoctl(PVOID ClassData,
PIO_STACK_LOCATION IrpSp; PIO_STACK_LOCATION IrpSp;
NTSTATUS Status; NTSTATUS Status;
ULONG WaitTime; ULONG WaitTime;
PBATTERY_WAIT_STATUS BattWait; BATTERY_WAIT_STATUS BattWait;
PBATTERY_QUERY_INFORMATION BattQueryInfo; PBATTERY_QUERY_INFORMATION BattQueryInfo;
PBATTERY_SET_INFORMATION BattSetInfo; PBATTERY_SET_INFORMATION BattSetInfo;
LARGE_INTEGER Timeout; LARGE_INTEGER Timeout;
@ -263,39 +263,39 @@ BatteryClassIoctl(PVOID ClassData,
break; break;
case IOCTL_BATTERY_QUERY_STATUS: case IOCTL_BATTERY_QUERY_STATUS:
if (IrpSp->Parameters.DeviceIoControl.InputBufferLength < sizeof(*BattWait) || if (IrpSp->Parameters.DeviceIoControl.InputBufferLength < sizeof(BattWait) ||
IrpSp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(BATTERY_STATUS)) IrpSp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(BATTERY_STATUS))
{ {
Status = STATUS_BUFFER_TOO_SMALL; Status = STATUS_BUFFER_TOO_SMALL;
break; break;
} }
BattWait = Irp->AssociatedIrp.SystemBuffer; BattWait = *(PBATTERY_WAIT_STATUS)Irp->AssociatedIrp.SystemBuffer;
Timeout.QuadPart = Int32x32To64(BattWait->Timeout, -1000); Timeout.QuadPart = Int32x32To64(BattWait.Timeout, -1000);
Status = BattClass->MiniportInfo.QueryStatus(BattClass->MiniportInfo.Context, Status = BattClass->MiniportInfo.QueryStatus(BattClass->MiniportInfo.Context,
BattWait->BatteryTag, BattWait.BatteryTag,
(PBATTERY_STATUS)Irp->AssociatedIrp.SystemBuffer); (PBATTERY_STATUS)Irp->AssociatedIrp.SystemBuffer);
BattStatus = Irp->AssociatedIrp.SystemBuffer; BattStatus = Irp->AssociatedIrp.SystemBuffer;
if (!NT_SUCCESS(Status) || if (!NT_SUCCESS(Status) ||
((BattWait->PowerState & BattStatus->PowerState) && ((BattWait.PowerState & BattStatus->PowerState) &&
(BattWait->HighCapacity <= BattStatus->Capacity) && (BattWait.HighCapacity <= BattStatus->Capacity) &&
(BattWait->LowCapacity >= BattStatus->Capacity))) (BattWait.LowCapacity >= BattStatus->Capacity)))
{ {
BattNotify.PowerState = BattWait->PowerState; BattNotify.PowerState = BattWait.PowerState;
BattNotify.HighCapacity = BattWait->HighCapacity; BattNotify.HighCapacity = BattWait.HighCapacity;
BattNotify.LowCapacity = BattWait->LowCapacity; BattNotify.LowCapacity = BattWait.LowCapacity;
BattClass->MiniportInfo.SetStatusNotify(BattClass->MiniportInfo.Context, BattClass->MiniportInfo.SetStatusNotify(BattClass->MiniportInfo.Context,
BattWait->BatteryTag, BattWait.BatteryTag,
&BattNotify); &BattNotify);
ExAcquireFastMutex(&BattClass->Mutex); ExAcquireFastMutex(&BattClass->Mutex);
BattClass->EventTrigger = EVENT_BATTERY_STATUS; BattClass->EventTrigger = EVENT_BATTERY_STATUS;
BattClass->EventTriggerContext = BattWait; BattClass->EventTriggerContext = &BattWait;
BattClass->Waiting = TRUE; BattClass->Waiting = TRUE;
ExReleaseFastMutex(&BattClass->Mutex); ExReleaseFastMutex(&BattClass->Mutex);
@ -303,7 +303,7 @@ BatteryClassIoctl(PVOID ClassData,
Executive, Executive,
KernelMode, KernelMode,
FALSE, FALSE,
BattWait->Timeout != -1 ? &Timeout : NULL); BattWait.Timeout != -1 ? &Timeout : NULL);
ExAcquireFastMutex(&BattClass->Mutex); ExAcquireFastMutex(&BattClass->Mutex);
BattClass->Waiting = FALSE; BattClass->Waiting = FALSE;
@ -314,7 +314,7 @@ BatteryClassIoctl(PVOID ClassData,
if (Status == STATUS_SUCCESS) if (Status == STATUS_SUCCESS)
{ {
Status = BattClass->MiniportInfo.QueryStatus(BattClass->MiniportInfo.Context, Status = BattClass->MiniportInfo.QueryStatus(BattClass->MiniportInfo.Context,
BattWait->BatteryTag, BattWait.BatteryTag,
(PBATTERY_STATUS)Irp->AssociatedIrp.SystemBuffer); (PBATTERY_STATUS)Irp->AssociatedIrp.SystemBuffer);
if (NT_SUCCESS(Status)) if (NT_SUCCESS(Status))
Irp->IoStatus.Information = sizeof(ULONG); Irp->IoStatus.Information = sizeof(ULONG);