From: Donald Sharp <sharpd@nvidia.com>
Date: Thu, 24 Sep 2020 12:12:49 +0000 (-0400)
Subject: pimd: When bind fails we could leave an open socket
X-Git-Tag: frr-7.5~11^2~25
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=ad0aafc347c894226bced141feb4295d6df7b96c;p=matthieu%2Ffrr.git

pimd: When bind fails we could leave an open socket

Clean up the rare situation when bind fails to not
close the fd that was just opened and have the socket
leaked.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
---

diff --git a/pimd/pim_igmp.c b/pimd/pim_igmp.c
index ed580d7539..04ece6dbb0 100644
--- a/pimd/pim_igmp.c
+++ b/pimd/pim_igmp.c
@@ -1013,6 +1013,8 @@ struct igmp_sock *pim_igmp_sock_add(struct list *igmp_sock_list,
 	if (bind(fd, (struct sockaddr *) &sin, sizeof(sin)) != 0) {
 		zlog_warn("Could not bind IGMP socket for %s on %s",
 			  inet_ntoa(ifaddr), ifp->name);
+		close(fd);
+
 		return NULL;
 	}