[Cluster-devel] cluster/cman-kernel/src sm_barrier.c

[teigland at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	STABLE
Changes by:	teigland at sourceware.org	2006-09-25 15:23:01

Modified files:
	cman-kernel/src: sm_barrier.c 

Log message:
	process_startdone_barrier_new() can be called when sg->sevent is
	NULL, but we weren't checking for NULL and just deferencing the
	sev->flags which led to oops in bz 206212.
	(sync with RHEL4 branch)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman-kernel/src/sm_barrier.c.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.1.6.1.2.1&r2=1.1.6.1.2.2

--- cluster/cman-kernel/src/Attic/sm_barrier.c	2005/06/22 04:41:52	1.1.6.1.2.1
+++ cluster/cman-kernel/src/Attic/sm_barrier.c	2006/09/25 15:23:01	1.1.6.1.2.2
@@ -141,6 +141,12 @@
 {
 	sm_sevent_t *sev = sg->sevent;
 
+	if (!sev) {
+		log_error(sg, "process_startdone_barrier_new: no sev %d",
+			  status);
+		return;
+	}
+
 	if (!test_and_clear_bit(SEFL_ALLOW_BARRIER, &sev->se_flags)) {
 		log_debug(sev->se_sg, "ignore barrier cb status %d", status);
 		return;