From 7f084787e316a2c02e38e8a542620d4d57bc9dbc Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Fri, 28 Jun 2019 15:21:36 -0700
Subject: [PATCH] sys: fix issues found by static analyzer

---
 src/sys/ea.c       |  1 +
 src/sys/fileinfo.c | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/sys/ea.c b/src/sys/ea.c
index 7da3b71d..a53176c5 100644
--- a/src/sys/ea.c
+++ b/src/sys/ea.c
@@ -55,6 +55,7 @@ FSP_DRIVER_DISPATCH FspSetEa;
 #ifdef ALLOC_PRAGMA
 #pragma alloc_text(PAGE, FspFsvolQueryEaGetCopy)
 #pragma alloc_text(PAGE, FspFsvolQueryEaIndexCopy)
+#pragma alloc_text(PAGE, FspFsvolQueryEaCopy)
 #pragma alloc_text(PAGE, FspFsvolQueryEa)
 #pragma alloc_text(PAGE, FspFsvolQueryEaComplete)
 #pragma alloc_text(PAGE, FspFsvolQueryEaRequestFini)
diff --git a/src/sys/fileinfo.c b/src/sys/fileinfo.c
index 55d6a310..84147918 100644
--- a/src/sys/fileinfo.c
+++ b/src/sys/fileinfo.c
@@ -847,6 +847,8 @@ static NTSTATUS FspFsvolQueryInformationEffectiveAccess(
     PDEVICE_OBJECT FsvolDeviceObject, PFILE_OBJECT FileObject,
     PACCESS_MASK PEffectiveAccess)
 {
+    PAGED_CODE();
+
     union
     {
         SECURITY_DESCRIPTOR V;
@@ -2117,7 +2119,7 @@ BOOLEAN FspFastIoQueryBasicInfo(
         if (Result)
         {
             PVOID Buffer = Info;
-            PVOID BufferEnd = (PUINT8)Info + sizeof Info;
+            PVOID BufferEnd = (PUINT8)Info + sizeof *Info;
             NTSTATUS Result0 = FspFsvolQueryBasicInformation(FileObject, &Buffer, BufferEnd, &FileInfoBuf);
             if (!NT_SUCCESS(Result0))
                 FSP_RETURN(Result = FALSE);
@@ -2155,7 +2157,7 @@ BOOLEAN FspFastIoQueryStandardInfo(
         if (Result)
         {
             PVOID Buffer = Info;
-            PVOID BufferEnd = (PUINT8)Info + sizeof Info;
+            PVOID BufferEnd = (PUINT8)Info + sizeof *Info;
             NTSTATUS Result0 = FspFsvolQueryStandardInformation(FileObject, &Buffer, BufferEnd, &FileInfoBuf);
             if (!NT_SUCCESS(Result0))
                 FSP_RETURN(Result = FALSE);
@@ -2193,7 +2195,7 @@ BOOLEAN FspFastIoQueryNetworkOpenInfo(
         if (Result)
         {
             PVOID Buffer = Info;
-            PVOID BufferEnd = (PUINT8)Info + sizeof Info;
+            PVOID BufferEnd = (PUINT8)Info + sizeof *Info;
             NTSTATUS Result0 = FspFsvolQueryNetworkOpenInformation(FileObject, &Buffer, BufferEnd, &FileInfoBuf);
             if (!NT_SUCCESS(Result0))
                 FSP_RETURN(Result = FALSE);
@@ -2237,7 +2239,7 @@ BOOLEAN FspFastIoQueryOpen(
     if (Result)
     {
         PVOID Buffer = Info;
-        PVOID BufferEnd = (PUINT8)Info + sizeof Info;
+        PVOID BufferEnd = (PUINT8)Info + sizeof *Info;
         NTSTATUS Result0 = FspFsvolQueryNetworkOpenInformation(FileObject, &Buffer, BufferEnd, &FileInfoBuf);
         if (!NT_SUCCESS(Result0))
             FSP_RETURN(Result = FALSE);