From: Jes Sorensen <Jes.Sorensen@redhat.com>
Date: Wed, 2 Nov 2011 21:07:02 +0000 (+1100)
Subject: ping_monitor(): check file descriptor is valid before using and closing it
X-Git-Tag: mdadm-3.2.3~75
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b36c89351659e1ee3367b32715cf12ef80682b12;p=thirdparty%2Fmdadm.git

ping_monitor(): check file descriptor is valid before using and closing it

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/msg.c b/msg.c
index 98d6d13b..87d3b8d6 100644
--- a/msg.c
+++ b/msg.c
@@ -207,9 +207,14 @@ int fping_monitor(int sfd)
 int ping_monitor(char *devname)
 {
 	int sfd = connect_monitor(devname);
-	int err = fping_monitor(sfd);
+	int err;
+
+	if (sfd >= 0) {
+		err = fping_monitor(sfd);
+		close(sfd);
+	} else
+		err = -1;
 
-	close(sfd);
 	return err;
 }