sys: fix issues found by static analyzer

This commit is contained in:
Bill Zissimopoulos 2019-06-28 15:21:36 -07:00
parent 369c0256f3
commit 7f084787e3
2 changed files with 7 additions and 4 deletions

View File

@ -55,6 +55,7 @@ FSP_DRIVER_DISPATCH FspSetEa;
#ifdef ALLOC_PRAGMA #ifdef ALLOC_PRAGMA
#pragma alloc_text(PAGE, FspFsvolQueryEaGetCopy) #pragma alloc_text(PAGE, FspFsvolQueryEaGetCopy)
#pragma alloc_text(PAGE, FspFsvolQueryEaIndexCopy) #pragma alloc_text(PAGE, FspFsvolQueryEaIndexCopy)
#pragma alloc_text(PAGE, FspFsvolQueryEaCopy)
#pragma alloc_text(PAGE, FspFsvolQueryEa) #pragma alloc_text(PAGE, FspFsvolQueryEa)
#pragma alloc_text(PAGE, FspFsvolQueryEaComplete) #pragma alloc_text(PAGE, FspFsvolQueryEaComplete)
#pragma alloc_text(PAGE, FspFsvolQueryEaRequestFini) #pragma alloc_text(PAGE, FspFsvolQueryEaRequestFini)

View File

@ -847,6 +847,8 @@ static NTSTATUS FspFsvolQueryInformationEffectiveAccess(
PDEVICE_OBJECT FsvolDeviceObject, PFILE_OBJECT FileObject, PDEVICE_OBJECT FsvolDeviceObject, PFILE_OBJECT FileObject,
PACCESS_MASK PEffectiveAccess) PACCESS_MASK PEffectiveAccess)
{ {
PAGED_CODE();
union union
{ {
SECURITY_DESCRIPTOR V; SECURITY_DESCRIPTOR V;
@ -2117,7 +2119,7 @@ BOOLEAN FspFastIoQueryBasicInfo(
if (Result) if (Result)
{ {
PVOID Buffer = Info; PVOID Buffer = Info;
PVOID BufferEnd = (PUINT8)Info + sizeof Info; PVOID BufferEnd = (PUINT8)Info + sizeof *Info;
NTSTATUS Result0 = FspFsvolQueryBasicInformation(FileObject, &Buffer, BufferEnd, &FileInfoBuf); NTSTATUS Result0 = FspFsvolQueryBasicInformation(FileObject, &Buffer, BufferEnd, &FileInfoBuf);
if (!NT_SUCCESS(Result0)) if (!NT_SUCCESS(Result0))
FSP_RETURN(Result = FALSE); FSP_RETURN(Result = FALSE);
@ -2155,7 +2157,7 @@ BOOLEAN FspFastIoQueryStandardInfo(
if (Result) if (Result)
{ {
PVOID Buffer = Info; PVOID Buffer = Info;
PVOID BufferEnd = (PUINT8)Info + sizeof Info; PVOID BufferEnd = (PUINT8)Info + sizeof *Info;
NTSTATUS Result0 = FspFsvolQueryStandardInformation(FileObject, &Buffer, BufferEnd, &FileInfoBuf); NTSTATUS Result0 = FspFsvolQueryStandardInformation(FileObject, &Buffer, BufferEnd, &FileInfoBuf);
if (!NT_SUCCESS(Result0)) if (!NT_SUCCESS(Result0))
FSP_RETURN(Result = FALSE); FSP_RETURN(Result = FALSE);
@ -2193,7 +2195,7 @@ BOOLEAN FspFastIoQueryNetworkOpenInfo(
if (Result) if (Result)
{ {
PVOID Buffer = Info; PVOID Buffer = Info;
PVOID BufferEnd = (PUINT8)Info + sizeof Info; PVOID BufferEnd = (PUINT8)Info + sizeof *Info;
NTSTATUS Result0 = FspFsvolQueryNetworkOpenInformation(FileObject, &Buffer, BufferEnd, &FileInfoBuf); NTSTATUS Result0 = FspFsvolQueryNetworkOpenInformation(FileObject, &Buffer, BufferEnd, &FileInfoBuf);
if (!NT_SUCCESS(Result0)) if (!NT_SUCCESS(Result0))
FSP_RETURN(Result = FALSE); FSP_RETURN(Result = FALSE);
@ -2237,7 +2239,7 @@ BOOLEAN FspFastIoQueryOpen(
if (Result) if (Result)
{ {
PVOID Buffer = Info; PVOID Buffer = Info;
PVOID BufferEnd = (PUINT8)Info + sizeof Info; PVOID BufferEnd = (PUINT8)Info + sizeof *Info;
NTSTATUS Result0 = FspFsvolQueryNetworkOpenInformation(FileObject, &Buffer, BufferEnd, &FileInfoBuf); NTSTATUS Result0 = FspFsvolQueryNetworkOpenInformation(FileObject, &Buffer, BufferEnd, &FileInfoBuf);
if (!NT_SUCCESS(Result0)) if (!NT_SUCCESS(Result0))
FSP_RETURN(Result = FALSE); FSP_RETURN(Result = FALSE);