From e48d6a658fa214bc624ee58e6d87b4ac0d573db6 Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Tue, 3 Oct 2017 21:21:09 +0200 Subject: [PATCH] [CLASS2]: Cosmetic fixes by Thomas --- drivers/storage/class/class2/class2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/storage/class/class2/class2.c b/drivers/storage/class/class2/class2.c index 48598e37b85..2f81022c5d7 100644 --- a/drivers/storage/class/class2/class2.c +++ b/drivers/storage/class/class2/class2.c @@ -4068,7 +4068,7 @@ Return Value: RtlZeroMemory(name, sizeof(MOUNTDEV_NAME)); name->NameLength = deviceExtension->DeviceName.Length; - if (irpStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(USHORT) + name->NameLength) { + if (irpStack->Parameters.DeviceIoControl.OutputBufferLength < FIELD_OFFSET(MOUNTDEV_NAME, Name) + name->NameLength) { Irp->IoStatus.Information = sizeof(MOUNTDEV_NAME); Irp->IoStatus.Status = STATUS_BUFFER_OVERFLOW; @@ -4081,7 +4081,7 @@ Return Value: name->NameLength); status = STATUS_SUCCESS; Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = sizeof(USHORT) + name->NameLength; + Irp->IoStatus.Information = FIELD_OFFSET(MOUNTDEV_NAME, Name) + name->NameLength; IoCompleteRequest(Irp, IO_NO_INCREMENT); goto SetStatusAndReturn; }