summaryrefslogtreecommitdiff
path: root/msg.c
diff options
context:
space:
mode:
authorJes Sorensen <Jes.Sorensen@redhat.com>2011-11-03 08:07:02 +1100
committerNeilBrown <neilb@suse.de>2011-11-03 08:07:02 +1100
commitb36c89351659e1ee3367b32715cf12ef80682b12 (patch)
tree45d1dafb4c517f6710b5f1955be52ef10be29b9f /msg.c
parent5a53aeec7f333e22682930d8fe228b572b7f55c9 (diff)
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>
Diffstat (limited to 'msg.c')
-rw-r--r--msg.c9
1 files changed, 7 insertions, 2 deletions
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;
}