Attachment 579426 Details for Bug 810916 – 6.1.z-bz810916-1-Unlink-shm-buffers-if-init-fails

[patch] 6.1.z-bz810916-1-Unlink-shm-buffers-if-init-fails

bz810916-1-Unlink-shm-buffers-if-init-fails.patch (text/plain), 1.49 KB, created by Jan Friesse on 2012-04-23 07:20:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Friesse

Created: 2012-04-23 07:20:35 UTC

Size: 1.49 KB

patch

obsolete

>Author: Jan Friesse <jfriesse@redhat.com>
>Date:   Mon Apr 23 09:18:37 2012 +0200
>
>    Unlink shm buffers if init fails
>    
>    If ipc init failed, buffers was not unlinked nether by client (lib) side
>    nor server (corosync) side. This may lead to fill all available space,
>    resulting in no accept of other connection. Typical example can be user
>    running any corosync ipc binary (like corosync-objctl), without correct
>    uid/gid entry in corosync configuration, resulting in DOS.
>    
>    Signed-off-by: Jan Friesse <jfriesse@redhat.com>
>    Reviewed-by: Steven Dake <sdake@redhat.com>
>    (Backported for 6.1.z)
>
>diff --git a/lib/coroipcc.c b/lib/coroipcc.c
>index bbeb95f..842df13 100644
>--- a/lib/coroipcc.c
>+++ b/lib/coroipcc.c
>@@ -736,7 +736,7 @@ coroipcc_service_connect (
> 
> 	ipc_instance->fd = request_fd;
> 
>-	if (res_setup.error == CS_ERR_TRY_AGAIN) {
>+	if (res_setup.error != CS_OK) {
> 		res = res_setup.error;
> 		goto error_exit;
> 	}
>@@ -758,12 +758,16 @@ error_exit:
> 		semctl (ipc_instance->control_buffer->semid, 0, IPC_RMID);
> #endif
> 	memory_unmap (ipc_instance->dispatch_buffer, dispatch_size);
>+	unlink (dispatch_map_path);
> error_dispatch_buffer:
> 	memory_unmap (ipc_instance->response_buffer, response_size);
>+	unlink (response_map_path);
> error_response_buffer:
> 	memory_unmap (ipc_instance->request_buffer, request_size);
>+	unlink (request_map_path);
> error_request_buffer:
> 	memory_unmap (ipc_instance->control_buffer, 8192);
>+	unlink (control_map_path);
> error_connect:
> 	close (request_fd);
>

Actions: View | Diff

Attachments on bug 810916: 579426