Skip to content

Commit

Permalink
tree-wide: set MSG_NOSIGNAL
Browse files Browse the repository at this point in the history
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
  • Loading branch information
Christian Brauner committed Jul 5, 2018
1 parent 7288dfb commit 57b1ab6
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions src/lxc/commands.c
Expand Up @@ -206,7 +206,7 @@ static int lxc_cmd_rsp_send(int fd, struct lxc_cmd_rsp *rsp)
{
ssize_t ret;

ret = send(fd, rsp, sizeof(*rsp), 0);
ret = send(fd, rsp, sizeof(*rsp), MSG_NOSIGNAL);
if (ret < 0 || (size_t)ret != sizeof(*rsp)) {
SYSERROR("Failed to send command response %zd", ret);
return -1;
Expand All @@ -215,7 +215,7 @@ static int lxc_cmd_rsp_send(int fd, struct lxc_cmd_rsp *rsp)
if (!rsp->data || rsp->datalen <= 0)
return 0;

ret = send(fd, rsp->data, rsp->datalen, 0);
ret = send(fd, rsp->data, rsp->datalen, MSG_NOSIGNAL);
if (ret < 0 || ret != (ssize_t)rsp->datalen) {
SYSWARN("Failed to send command response data %zd", ret);
return -1;
Expand Down
6 changes: 3 additions & 3 deletions src/lxc/network.c
Expand Up @@ -3094,7 +3094,7 @@ int lxc_network_send_veth_names_to_child(struct lxc_handler *handler)
if (netdev->type != LXC_NET_VETH)
continue;

ret = send(data_sock, netdev->name, IFNAMSIZ, 0);
ret = send(data_sock, netdev->name, IFNAMSIZ, MSG_NOSIGNAL);
if (ret < 0)
return -1;
TRACE("Sent network device name \"%s\" to child", netdev->name);
Expand Down Expand Up @@ -3142,14 +3142,14 @@ int lxc_network_send_name_and_ifindex_to_parent(struct lxc_handler *handler)
struct lxc_netdev *netdev = iterator->elem;

/* Send network device name in the child's namespace to parent. */
ret = send(data_sock, netdev->name, IFNAMSIZ, 0);
ret = send(data_sock, netdev->name, IFNAMSIZ, MSG_NOSIGNAL);
if (ret < 0)
return -1;

/* Send network device ifindex in the child's namespace to
* parent.
*/
ret = send(data_sock, &netdev->ifindex, sizeof(netdev->ifindex), 0);
ret = send(data_sock, &netdev->ifindex, sizeof(netdev->ifindex), MSG_NOSIGNAL);
if (ret < 0)
return -1;
}
Expand Down
2 changes: 1 addition & 1 deletion src/lxc/nl.c
Expand Up @@ -229,7 +229,7 @@ extern int netlink_send(struct nl_handler *handler, struct nlmsg *nlmsg)
nladdr.nl_pid = 0;
nladdr.nl_groups = 0;

ret = sendmsg(handler->fd, &msg, 0);
ret = sendmsg(handler->fd, &msg, MSG_NOSIGNAL);
if (ret < 0)
return -errno;

Expand Down
2 changes: 1 addition & 1 deletion src/lxc/start.c
Expand Up @@ -452,7 +452,7 @@ int lxc_serve_state_clients(const char *name, struct lxc_handler *handler,
lxc_state2str(state), client->clientfd);

again:
ret = send(client->clientfd, &msg, sizeof(msg), 0);
ret = send(client->clientfd, &msg, sizeof(msg), MSG_NOSIGNAL);
if (ret <= 0) {
if (errno == EINTR) {
TRACE("Caught EINTR; retrying");
Expand Down

0 comments on commit 57b1ab6

Please sign in to comment.