proxmox-mirrors/mirror_corosync
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_corosync synced 2025-08-03 10:50:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Coroipcc: Make sure that coroipcc_service_connect() always return a valid cs_error_t

Browse Source 
git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2748 fd59a12c-fef9-0310-b244-a6a79926bd2f
This commit is contained in:
Jrme Flesch 2010-03-30 07:24:59 +00:00
parent 621a7c0ee1
commit 52acd736d0
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/coroipcc.c
View File

@ -654,42 +654,42 @@ coroipcc_service_connect (
goto error_connect;
}
res = memory_map (
sys_res = memory_map (
control_map_path,
"control_buffer-XXXXXX",
(void *)&ipc_instance->control_buffer,
8192);
if (res == -1) {
if (sys_res == -1) {
res = CS_ERR_LIBRARY;
goto error_connect;
}
res = memory_map (
sys_res = memory_map (
request_map_path,
"request_buffer-XXXXXX",
(void *)&ipc_instance->request_buffer,
request_size);
if (res == -1) {
if (sys_res == -1) {
res = CS_ERR_LIBRARY;
goto error_request_buffer;
}
res = memory_map (
sys_res = memory_map (
response_map_path,
"response_buffer-XXXXXX",
(void *)&ipc_instance->response_buffer,
response_size);
if (res == -1) {
if (sys_res == -1) {
res = CS_ERR_LIBRARY;
goto error_response_buffer;
}
res = circular_memory_map (
sys_res = circular_memory_map (
dispatch_map_path,
"dispatch_buffer-XXXXXX",
(void *)&ipc_instance->dispatch_buffer,
dispatch_size);
if (res == -1) {
if (sys_res == -1) {
res = CS_ERR_LIBRARY;
goto error_dispatch_buffer;
}
@ -699,7 +699,6 @@ coroipcc_service_connect (
sem_init (&ipc_instance->control_buffer->sem1, 1, 0);
sem_init (&ipc_instance->control_buffer->sem2, 1, 0);
#else
/*
* Allocate a semaphore segment
*/
@ -718,18 +717,21 @@ coroipcc_service_connect (
* an existing shared memory segment for which we have access
*/
if (errno != EEXIST && errno != EACCES) {
res = CS_ERR_LIBRARY;
goto error_exit;
}
}
semun.val = 0;
res = semctl (ipc_instance->semid, 0, SETVAL, semun);
if (res != 0) {
sys_res = semctl (ipc_instance->semid, 0, SETVAL, semun);
if (sys_res != 0) {
res = CS_ERR_LIBRARY;
goto error_exit;
}
res = semctl (ipc_instance->semid, 1, SETVAL, semun);
if (res != 0) {
sys_res = semctl (ipc_instance->semid, 1, SETVAL, semun);
if (sys_res != 0) {
res = CS_ERR_LIBRARY;
goto error_exit;
}
#endif