Windows: Restrict redir trace buffer to 10240KB

Define macro AFS_DBG_LOG_MAXLENGTH to 10240 and then use it to
enforce the 10MB trace buffer limit.

Reviewed-on: http://gerrit.openafs.org/11146
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: Jeffrey Altman <jaltman@your-file-system.com>
(cherry picked from commit 72bc3848536cc71b8950e5619f5769f60a73f3ab)

Change-Id: If5edd718650328b493ab2f386b3a39b459320190
Reviewed-on: http://gerrit.openafs.org/11147
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>

diff --git a/src/WINNT/afsrdr/kernel/fs/AFSGeneric.cpp b/src/WINNT/afsrdr/kernel/fs/AFSGeneric.cpp
index f607cfc..27503bb 100644 (file)
--- a/src/WINNT/afsrdr/kernel/fs/AFSGeneric.cpp
+++ b/src/WINNT/afsrdr/kernel/fs/AFSGeneric.cpp
@@ -417,10 +417,10 @@ AFSReadRegistry( IN PUNICODE_STRING RegistryPath)
             // Let's limit things a bit ...
             //
 
-            if( AFSDbgBufferLength > 10240)
+           if( AFSDbgBufferLength > AFS_DBG_LOG_MAXLENGTH)
             {
 
-                AFSDbgBufferLength = 1024;
+               AFSDbgBufferLength = AFS_DBG_LOG_MAXLENGTH;
             }
         }
         else

diff --git a/src/WINNT/afsrdr/kernel/fs/AFSLogSupport.cpp b/src/WINNT/afsrdr/kernel/fs/AFSLogSupport.cpp
index 779c090..bcec8b6 100644 (file)
--- a/src/WINNT/afsrdr/kernel/fs/AFSLogSupport.cpp
+++ b/src/WINNT/afsrdr/kernel/fs/AFSLogSupport.cpp
@@ -361,7 +361,16 @@ AFSConfigureTrace( IN AFSTraceConfigCB *TraceInfo)
                 DbgPrint("AFSConfigureTrace Failed to set debug buffer length in registry Status %08lX\n", ntStatus);
             }
 
-            AFSDbgBufferLength = TraceInfo->TraceBufferLength * 1024;
+           if ( TraceInfo->TraceBufferLength > AFS_DBG_LOG_MAXLENGTH)
+           {
+
+               AFSDbgBufferLength = AFS_DBG_LOG_MAXLENGTH * 1024;
+           }
+           else
+           {
+
+               AFSDbgBufferLength = TraceInfo->TraceBufferLength * 1024;
+           }
 
             ClearFlag( AFSDbgLogFlags, AFS_DBG_LOG_WRAPPED);
 

diff --git a/src/WINNT/afsrdr/kernel/fs/Include/AFSDefines.h b/src/WINNT/afsrdr/kernel/fs/Include/AFSDefines.h
index fc1f595..c6701b3 100644 (file)
--- a/src/WINNT/afsrdr/kernel/fs/Include/AFSDefines.h
+++ b/src/WINNT/afsrdr/kernel/fs/Include/AFSDefines.h
@@ -251,7 +251,7 @@ DEFINE_GUID (GUID_SD_AFS_REDIRECTOR_CONTROL_OBJECT,
 // Debug log length
 //
 
-#define AFS_DBG_LOG_LENGTH              256
+#define AFS_DBG_LOG_MAXLENGTH          10240   //KBs
 
 //
 // Debug log flags