[dm-devel] multipath-tools/multipathd main.c

[bmarzins sourceware org]

CVSROOT:	/cvs/dm
Module name:	multipath-tools
Branch: 	RHEL5_FC6
Changes by:	bmarzins sourceware org	2011-10-24 13:46:54

Modified files:
	multipathd     : main.c 

Log message:
	fix for bz #741664. setup_multipath frees the multipath device if it fails,
	so check the return value, and don't touch the multipath device, it
	setup_multipath() has returned 1.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/multipathd/main.c.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.69.2.37&r2=1.69.2.38

--- multipath-tools/multipathd/main.c	2011/10/10 04:15:41	1.69.2.37
+++ multipath-tools/multipathd/main.c	2011/10/24 13:46:54	1.69.2.38
@@ -988,7 +988,8 @@
 		return 1;
 	}
 	dm_lib_release();
-	setup_multipath(vecs, mpp);
+	if (setup_multipath(vecs, mpp) != 0)
+		return 1;
 	sync_map_state(mpp);
 
 	return 0;