Attachment 632732 Details for Bug 869609 – Proposed patch

[patch] Proposed patch

2012-10-24-0001-Ignore-sync-barrier-msgs-if-sync-doesn-t-started.patch (text/plain), 1.01 KB, created by Jan Friesse on 2012-10-24 12:10:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Friesse

Created: 2012-10-24 12:10:33 UTC

Size: 1.01 KB

patch

obsolete

>From 2c70d50f5d651af2f0ad586c9a8ee9c411cf981d Mon Sep 17 00:00:00 2001
>From: Jan Friesse <jfriesse@redhat.com>
>Date: Wed, 24 Oct 2012 13:43:58 +0200
>Subject: [PATCH] Ignore sync barrier msgs if sync doesn't started
>
>On start of corosync, we can receive sync barrier message. If so,
>our sync_ring_id is set to NULL, and memcpy of message ring_id will
>segfault. Instead of that, sync barrier message is ignored if
>sync_ring_id is NULL.
>
>Signed-off-by: Jan Friesse <jfriesse@redhat.com>
>---
> exec/sync.c |    6 ++++++
> 1 files changed, 6 insertions(+), 0 deletions(-)
>
>diff --git a/exec/sync.c b/exec/sync.c
>index 58518ac..42cd11c 100644
>--- a/exec/sync.c
>+++ b/exec/sync.c
>@@ -392,6 +392,12 @@ static void sync_deliver_fn (
> 		sync_endian_convert (req_exec_sync_barrier_start);
> 	}
> 
>+	if (sync_ring_id == NULL) {
>+		log_printf (LOGSYS_LEVEL_DEBUG,
>+		    "Initial sync was not yet proceed. Ignoring sync msg\n");
>+		return ;
>+	}
>+
> 	barrier_completed = 1;
> 
> 	memcpy (&deliver_ring_id, &req_exec_sync_barrier_start->ring_id,
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 869609: 632732