apply fixes for OpenAFS Security Advisory 2007-003

diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c
index 81d10a13f0b3ae6e42ce8f73a600759b59603f34..7fcb6837ebf0d11df164b3b2ca72619b3131614e 100644 (file)
--- a/src/viced/afsfileprocs.c
+++ b/src/viced/afsfileprocs.c
@@ -5877,7 +5877,9 @@ common_GiveUpCallBacks(struct rx_call *acall, struct AFSCBFids *FidArray,
                 (tcon->peer ? tcon->peer->host : 0)));
        errorCode = GetClient(tcon, &client);
        if (!errorCode)
+           H_LOCK;
            DeleteAllCallBacks_r(client->host, 1);
+           H_UNLOCK;
     } else {
        if (FidArray->AFSCBFids_len < CallBackArray->AFSCBs_len) {
            ViceLog(0,

diff --git a/src/viced/host.c b/src/viced/host.c
index c00216fb7aa1f203fc03b209baaaad6c5e1aeb37..28f2f9018c421e7dd30c1ccf901f4adb4d0c5f95 100644 (file)
--- a/src/viced/host.c
+++ b/src/viced/host.c
@@ -1092,6 +1092,7 @@ h_GetHost_r(struct rx_connection *tcon)
                     host->interface ? uuid2 : ""));
 
            /* The host in the cache is not the host for this connection */
+           h_Lock_r(host);
            host->hostFlags |= HOSTDELETED;
            h_Unlock_r(host);
            if (!held)