From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Fri, 6 Jul 2012 19:07:13 +0000 (-0400)
Subject: Windows: cm_MergeStatus unknown interface numbers
X-Git-Tag: upstream/1.6.2_pre2^2~35
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=441e6fc771a9063bcac2b68a094ad7c6cce99f7e;p=packages%2Fo%2Fopenafs.git

Windows: cm_MergeStatus unknown interface numbers

Ignore status information if the interface number is unknown.
Currently only version 1 is recognized.

Reviewed-on: http://gerrit.openafs.org/7743
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: Jeffrey Altman <jaltman@your-file-system.com>
(cherry picked from commit 8115841e2fc9d827a7207ddc18e5c84e466ed7e7)

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

diff --git a/src/WINNT/afsd/cm_scache.c b/src/WINNT/afsd/cm_scache.c
index 4e9c06ec8..af6c280b3 100644
--- a/src/WINNT/afsd/cm_scache.c
+++ b/src/WINNT/afsd/cm_scache.c
@@ -1468,6 +1468,12 @@ void cm_MergeStatus(cm_scache_t *dscp,
     }
 #endif /* AFS_FREELANCE_CLIENT */
 
+    if (statusp->InterfaceVersion != 0x1) {
+        osi_Log2(afsd_logp, "Merge, Failure scp 0x%p Invalid InterfaceVersion %u",
+                 scp, statusp->InterfaceVersion);
+        return;
+    }
+
     if (statusp->errorCode != 0) {
         _InterlockedOr(&scp->flags, CM_SCACHEFLAG_EACCESS);
 	osi_Log2(afsd_logp, "Merge, Failure scp 0x%p code 0x%x", scp, statusp->errorCode);