proxmox-mirrors/mirror_corosync
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_corosync synced 2025-08-05 07:49:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

This patch fixes the marshalling of lock names in libSaLck, they

Browse Source 
were copied using memcpy, but the alignment of a mar_name_t is not necessarily
the same as SaNameT. This patch changes memcpy() to marshall_to_mar_name_t().




git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1373 fd59a12c-fef9-0310-b244-a6a79926bd2f
This commit is contained in:
Patrick Caulfield 2007-05-18 07:28:36 +00:00
parent a161cc23c8
commit 4377475cac
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/lck.c
View File

@ -654,9 +654,9 @@ saLckResourceOpen (
req_lib_lck_resourceopen.header.size = sizeof (struct req_lib_lck_resourceopen);
req_lib_lck_resourceopen.header.id = MESSAGE_REQ_LCK_RESOURCEOPEN;
memcpy (&req_lib_lck_resourceopen.lockResourceName, lockResourceName, sizeof (SaNameT));
marshall_to_mar_name_t (&req_lib_lck_resourceopen.lockResourceName, lockResourceName);
memcpy (&lckResourceInstance->lockResourceName, lockResourceName, sizeof (SaNameT));
memcpy (&lckResourceInstance->lockResourceName, lockResourceName, sizeof(SaNameT));
req_lib_lck_resourceopen.resourceOpenFlags = resourceOpenFlags;
req_lib_lck_resourceopen.resourceHandle = *lckResourceHandle;
req_lib_lck_resourceopen.async_call = 0;
@ -793,8 +793,8 @@ saLckResourceClose (
req_lib_lck_resourceclose.header.size = sizeof (struct req_lib_lck_resourceclose);
req_lib_lck_resourceclose.header.id = MESSAGE_REQ_LCK_RESOURCECLOSE;
memcpy (&req_lib_lck_resourceclose.lockResourceName,
&lckResourceInstance->lockResourceName, sizeof (SaNameT));
marshall_to_mar_name_t (&req_lib_lck_resourceclose.lockResourceName,
&lckResourceInstance->lockResourceName);
req_lib_lck_resourceclose.resourceHandle = lckResourceHandle;
pthread_mutex_lock (lckResourceInstance->response_mutex);
@ -861,8 +861,8 @@ saLckResourceLock (
req_lib_lck_resourcelock.header.size = sizeof (struct req_lib_lck_resourcelock);
req_lib_lck_resourcelock.header.id = MESSAGE_REQ_LCK_RESOURCELOCK;
memcpy (&req_lib_lck_resourcelock.lockResourceName,
&lckResourceInstance->lockResourceName, sizeof (SaNameT));
marshall_to_mar_name_t (&req_lib_lck_resourcelock.lockResourceName,
&lckResourceInstance->lockResourceName);
req_lib_lck_resourcelock.lockMode = lockMode;
req_lib_lck_resourcelock.lockFlags = lockFlags;
req_lib_lck_resourcelock.waiterSignal = waiterSignal;
@ -954,8 +954,8 @@ saLckResourceLockAsync (
req_lib_lck_resourcelock.header.size = sizeof (struct req_lib_lck_resourcelock);
req_lib_lck_resourcelock.header.id = MESSAGE_REQ_LCK_RESOURCELOCKASYNC;
memcpy (&req_lib_lck_resourcelock.lockResourceName,
&lckResourceInstance->lockResourceName, sizeof (SaNameT));
marshall_to_mar_name_t (&req_lib_lck_resourcelock.lockResourceName,
&lckResourceInstance->lockResourceName);
req_lib_lck_resourcelock.lockMode = lockMode;
req_lib_lck_resourcelock.lockFlags = lockFlags;
req_lib_lck_resourcelock.waiterSignal = waiterSignal;
@ -1024,8 +1024,8 @@ saLckResourceUnlock (
return (error);
}
memcpy (&req_lib_lck_resourceunlock.lockResourceName,
&lckResourceInstance->lockResourceName, sizeof (SaNameT));
marshall_to_mar_name_t (&req_lib_lck_resourceunlock.lockResourceName,
&lckResourceInstance->lockResourceName);
saHandleInstancePut (&lckResourceHandleDatabase,
lckLockIdInstance->lckResourceHandle);
@ -1082,8 +1082,8 @@ saLckResourceUnlockAsync (
return (error);
}
memcpy (&req_lib_lck_resourceunlock.lockResourceName,
&lckResourceInstance->lockResourceName, sizeof (SaNameT));
marshall_to_mar_name_t (&req_lib_lck_resourceunlock.lockResourceName,
&lckResourceInstance->lockResourceName);
saHandleInstancePut (&lckResourceHandleDatabase,
lckLockIdInstance->lckResourceHandle);
@ -1130,8 +1130,8 @@ saLckLockPurge (
req_lib_lck_lockpurge.header.size = sizeof (struct req_lib_lck_lockpurge);
req_lib_lck_lockpurge.header.id = MESSAGE_REQ_LCK_LOCKPURGE;
memcpy (&req_lib_lck_lockpurge.lockResourceName,
&lckResourceInstance->lockResourceName, sizeof (SaNameT));
marshall_to_mar_name_t (&req_lib_lck_lockpurge.lockResourceName,
&lckResourceInstance->lockResourceName);
pthread_mutex_lock (lckResourceInstance->response_mutex);