proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 23:58:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7148 from pguibert6WIND/fix_fd_not_closed

Browse Source 
zebra: fix fd going out of scope leaks the handle
This commit is contained in:
Donald Sharp 2020-09-23 07:40:14 -04:00 committed by GitHub
commit aa178efd49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zebra/zebra_netns_id.c
View File

@ -182,7 +182,7 @@ ns_id_t zebra_ns_id_get(const char *netnspath, int fd_param)
if (sock < 0) { if (sock < 0) {
flog_err_sys(EC_LIB_SOCKET, "netlink( %u) socket() error: %s", flog_err_sys(EC_LIB_SOCKET, "netlink( %u) socket() error: %s",
sock, safe_strerror(errno)); sock, safe_strerror(errno));
if (fd_param == -1) if (netnspath)
close(fd); close(fd);
return NS_UNKNOWN; return NS_UNKNOWN;
} }
@ -196,7 +196,7 @@ ns_id_t zebra_ns_id_get(const char *netnspath, int fd_param)
"netlink( %u) socket() bind error: %s", sock, "netlink( %u) socket() bind error: %s", sock,
safe_strerror(errno)); safe_strerror(errno));
close(sock); close(sock);
if (fd_param == -1) if (netnspath)
close(fd); close(fd);
return NS_UNKNOWN; return NS_UNKNOWN;
} }
@ -219,7 +219,7 @@ ns_id_t zebra_ns_id_get(const char *netnspath, int fd_param)
ret = send_receive(sock, nlh, seq, buf); ret = send_receive(sock, nlh, seq, buf);
if (ret < 0) { if (ret < 0) {
close(sock); close(sock);
if (fd_param == -1) if (netnspath)
close(fd); close(fd);
return NS_UNKNOWN; return NS_UNKNOWN;
} }
@ -264,7 +264,7 @@ ns_id_t zebra_ns_id_get(const char *netnspath, int fd_param)
"netlink( %u) recvfrom() error 2 when reading: %s", "netlink( %u) recvfrom() error 2 when reading: %s",
fd, safe_strerror(errno)); fd, safe_strerror(errno));
close(sock); close(sock);
if (fd_param == -1) if (netnspath)
close(fd); close(fd);
if (errno == ENOTSUP) { if (errno == ENOTSUP) {
zlog_debug("NEWNSID locally generated"); zlog_debug("NEWNSID locally generated");
@ -286,7 +286,7 @@ ns_id_t zebra_ns_id_get(const char *netnspath, int fd_param)
ret = send_receive(sock, nlh, seq, buf); ret = send_receive(sock, nlh, seq, buf);
if (ret < 0) { if (ret < 0) {
close(sock); close(sock);
if (fd_param == -1) if (netnspath)
close(fd); close(fd);
return NS_UNKNOWN; return NS_UNKNOWN;
} }
@ -318,7 +318,7 @@ ns_id_t zebra_ns_id_get(const char *netnspath, int fd_param)
} while (len != 0 && ret == 0); } while (len != 0 && ret == 0);
} }
if (fd_param == -1) if (netnspath)
close(fd); close(fd);
close(sock); close(sock);
return return_nsid; return return_nsid;