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>
2011-11-03 08:07:02 +11:00 · 2011-11-03 08:07:02 +11:00 · b36c893516
parent 5a53aeec7f
commit b36c893516
1 changed files with 7 additions and 2 deletions
--- 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;
 }