ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linux-cp: fix issue of possibly closing negative fd

Browse Source 
Type: fix

Primarily fix an issue reported by Coverity in
lcp_nl_open_sync_socket() that close() could possibly be run with
negative fd. Also, add more checks and error logging there.

Signed-off-by: Alexander Chernavin <achernavin@netgate.com>
Change-Id: I9a88520d068392977a6eba0766451e5652fe512c
This commit is contained in:
Alexander Chernavin
2022-03-04 13:18:15 +00:00
committed by Matthew Smith
parent 2286f937d9
commit 7e721954d4
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/linux-cp/lcp_nl.c
View File

@@ -940,18 +940,27 @@ lcp_nl_open_sync_socket (nl_sock_type_t sock_type)
nm->sk_route_sync[sock_type] = sk_route = nl_socket_alloc ();
dest_ns_fd = lcp_get_default_ns_fd ();
if (dest_ns_fd)
if (dest_ns_fd > 0)
{
curr_ns_fd = clib_netns_open (NULL /* self */);
clib_setns (dest_ns_fd);
if (clib_setns (dest_ns_fd) == -1)
NL_ERROR ("Cannot set destination ns");
}
nl_connect (sk_route, NETLINK_ROUTE);
if (dest_ns_fd)
if (dest_ns_fd > 0)
{
clib_setns (curr_ns_fd);
close (curr_ns_fd);
if (curr_ns_fd == -1)
{
NL_ERROR ("No previous ns to set");
}
else
{
if (clib_setns (curr_ns_fd) == -1)
NL_ERROR ("Cannot set previous ns");
close (curr_ns_fd);
}
}
NL_INFO ("Opened netlink synchronization socket %d of type %d",