Skip to content

rtnl: reset and close request socket on error and export rtnl.close() #474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ptpt52 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

rtnl: reset and close request socket on error and export rtnl.close() #474

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 44 additions & 3 deletions lib/rtnl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3531,6 +3531,33 @@ static const struct {
{ RTM_FAM(RTM_GETNETCONF), &netconf_msg },
};

static void
uc_nl_sock_close(void)
{
if (sock) {
nl_socket_free(sock);
sock = NULL;
}
}

/**
* Close the cached request socket.
*
* Closes and resets the internal netlink socket used by request().
* Subsequent calls to request() will open a new socket.
*
* @function module:rtnl#close
*
* @returns {boolean} - Always returns true
*/
static uc_value_t *
uc_nl_close(uc_vm_t *vm, size_t nargs)
{
uc_nl_sock_close();

return ucv_boolean_new(true);
}

/**
* Send a netlink request.
*
Expand Down Expand Up @@ -3591,8 +3618,10 @@ uc_nl_request(uc_vm_t *vm, size_t nargs)

err = nl_connect(sock, NETLINK_ROUTE);

if (err != 0)
if (err != 0) {
uc_nl_sock_close();
err_return(err, NULL);
}
}

optlen = sizeof(enable);
Expand All @@ -3603,8 +3632,10 @@ uc_nl_request(uc_vm_t *vm, size_t nargs)
if (!!(flagval & NLM_F_STRICT_CHK) != enable) {
enable = !!(flagval & NLM_F_STRICT_CHK);

if (setsockopt(sock->s_fd, SOL_NETLINK, NETLINK_GET_STRICT_CHK, &enable, sizeof(enable)) < 0)
if (setsockopt(sock->s_fd, SOL_NETLINK, NETLINK_GET_STRICT_CHK, &enable, sizeof(enable)) < 0) {
uc_nl_sock_close();
err_return(nl_syserr2nlerr(errno), "Unable to toggle NETLINK_GET_STRICT_CHK");
}
}

msg = nlmsg_alloc_simple(ucv_int64_get(cmd), NLM_F_REQUEST | (flagval & ~NLM_F_STRICT_CHK));
Expand Down Expand Up @@ -3644,7 +3675,14 @@ uc_nl_request(uc_vm_t *vm, size_t nargs)
nl_cb_set(cb, NL_CB_ACK, NL_CB_CUSTOM, cb_done, &st);
nl_cb_err(cb, NL_CB_CUSTOM, cb_error, &st);

nl_send_auto_complete(sock, msg);
err = nl_send_auto_complete(sock, msg);

if (err < 0) {
nlmsg_free(msg);
nl_cb_put(cb);
uc_nl_sock_close();
err_return(err, NULL);
}

do {
err = nl_recvmsgs(sock, cb);
Expand All @@ -3668,9 +3706,11 @@ uc_nl_request(uc_vm_t *vm, size_t nargs)
return ucv_boolean_new(true);

case STATE_ERROR:
uc_nl_sock_close();
return ucv_boolean_new(false);

default:
uc_nl_sock_close();
set_error(NLE_FAILURE, "Interrupted reply");

return ucv_boolean_new(false);
Expand Down Expand Up @@ -4939,6 +4979,7 @@ register_constants(uc_vm_t *vm, uc_value_t *scope)
};

static const uc_function_list_t global_fns[] = {
{ "close", uc_nl_close },
{ "error", uc_nl_error },
{ "request", uc_nl_request },
{ "listener", uc_nl_listener },
Expand Down
Loading