Attachment 718030 Details for Bug 929100 – 6.3.z-bz929100-4-Properly-lock-pending_semops

[patch] 6.3.z-bz929100-4-Properly-lock-pending_semops

bz929100-4-Properly-lock-pending_semops.patch (text/plain), 3.02 KB, created by Jan Friesse on 2013-03-29 11:01:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Friesse

Created: 2013-03-29 11:01:20 UTC

Size: 3.02 KB

patch

obsolete

>From 4d050cfac3cd30ad60a58e8294298968ee9d89f9 Mon Sep 17 00:00:00 2001
>From: Jan Friesse <jfriesse@redhat.com>
>Date: Mon, 18 Mar 2013 10:18:04 +0100
>Subject: [PATCH] Properly lock pending_semops
>
>pending_semops variable can be changed in two threads. One is actual IPC
>connection and second is coropoll. It's really scholar example of race
>(one thread doing i++, second doing i--). If socket is full, it can
>happen that IPC will increase value and coropoll will decrease,
>resulting in unpredictable value. This means, that client IPC can be
>informed about more messages then really available, resulting
>in reading of garbage messages in library dispatch function.
>
>Solution is to properly lock variable.
>
>Signed-off-by: Jan Friesse <jfriesse@redhat.com>
>Reviewed-by: Fabio M. Di Nitto <fdinitto@redhat.com>
>---
> exec/coroipcs.c |   27 +++++++++++++++------------
> 1 files changed, 15 insertions(+), 12 deletions(-)
>
>diff --git a/exec/coroipcs.c b/exec/coroipcs.c
>index 36d18a4..5943046 100644
>--- a/exec/coroipcs.c
>+++ b/exec/coroipcs.c
>@@ -140,6 +140,7 @@ struct conn_info {
> 	key_t semkey;
> #endif
> 	unsigned int pending_semops;
>+	pthread_mutex_t pending_semops_mutex;
> 	pthread_mutex_t mutex;
> 	struct control_buffer *control_buffer;
> 	char *request_buffer;
>@@ -1265,12 +1266,14 @@ static void msg_send (void *conn, const struct iovec *iov, unsigned int iov_len,
> 	buf = list_empty (&conn_info->outq_head);
> 	res = send (conn_info->fd, &buf, 1, MSG_NOSIGNAL);
> 	if (res != 1) {
>+		pthread_mutex_lock(&conn_info->pending_semops_mutex);
> 		conn_info->pending_semops += 1;
> 		if (conn_info->poll_state == POLL_STATE_IN) {
> 			conn_info->poll_state = POLL_STATE_INOUT;
> 			api->poll_dispatch_modify (conn_info->fd,
> 				POLLIN|POLLOUT|POLLNVAL);
> 		}
>+		pthread_mutex_unlock(&conn_info->pending_semops_mutex);
> 	}
> 
> 	ipc_sem_post (conn_info->control_buffer, SEMAPHORE_DISPATCH);
>@@ -1648,6 +1651,7 @@ int coroipcs_handler_dispatch (
> 		}
> 
> 		pthread_mutex_init (&conn_info->mutex, NULL);
>+		pthread_mutex_init (&conn_info->pending_semops_mutex, NULL);
> 		req_setup = (mar_req_setup_t *)conn_info->setup_msg;
> 		/*
> 		 * Is the service registered ?
>@@ -1784,22 +1788,21 @@ int coroipcs_handler_dispatch (
> 	}
> 
> 	if (revent & POLLOUT) {
>-		int psop = conn_info->pending_semops;
>-		int i;
>-
>-		assert (psop != 0);
>-		for (i = 0; i < psop; i++) {
>-			res = send (conn_info->fd, &buf, 1, MSG_NOSIGNAL);
>-			if (res != 1) {
>-				return (0);
>-			} else {
>-				conn_info->pending_semops -= 1;
>-			}
>+		pthread_mutex_lock(&conn_info->pending_semops_mutex);
>+
>+		assert(conn_info->pending_semops != 0);
>+
>+		while (conn_info->pending_semops > 0 &&
>+			((res = send (conn_info->fd, &buf, 1, MSG_NOSIGNAL)) == 1)) {
>+
>+			conn_info->pending_semops -= 1;
> 		}
>-		if (conn_info->poll_state == POLL_STATE_INOUT) {
>+
>+		if (conn_info->pending_semops == 0 && conn_info->poll_state == POLL_STATE_INOUT) {
> 			conn_info->poll_state = POLL_STATE_IN;
> 			api->poll_dispatch_modify (conn_info->fd, POLLIN|POLLNVAL);
> 		}
>+		pthread_mutex_unlock(&conn_info->pending_semops_mutex);
> 	}
> 
> 	return (0);
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 929100: 718027 | 718028 | 718029 | 718030