proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-14 20:26:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tree-wide: make socket SOCK_CLOEXEC

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2019-05-03 20:35:02 +02:00
parent 5b94d538dd
commit ad9429e529
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lxc/af_unix.c
View File

@ -81,7 +81,7 @@ int lxc_abstract_unix_open(const char *path, int type, int flags)
ssize_t len; ssize_t len;
struct sockaddr_un addr; struct sockaddr_un addr;
fd = socket(PF_UNIX, type, 0); fd = socket(PF_UNIX, type | SOCK_CLOEXEC, 0);
if (fd < 0) if (fd < 0)
return -1; return -1;
@ -129,7 +129,7 @@ int lxc_abstract_unix_connect(const char *path)
ssize_t len; ssize_t len;
struct sockaddr_un addr; struct sockaddr_un addr;
fd = socket(PF_UNIX, SOCK_STREAM, 0); fd = socket(PF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
if (fd < 0) if (fd < 0)
return -1; return -1;
@ -371,7 +371,7 @@ int lxc_unix_connect(struct sockaddr_un *addr)
int ret; int ret;
ssize_t len; ssize_t len;
fd = socket(AF_UNIX, SOCK_STREAM, 0); fd = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
if (fd < 0) { if (fd < 0) {
SYSERROR("Failed to open new AF_UNIX socket"); SYSERROR("Failed to open new AF_UNIX socket");
return -1; return -1;

6
src/lxc/network.c
View File

@ -2187,7 +2187,7 @@ int lxc_bridge_attach(const char *bridge, const char *ifname)
if (is_ovs_bridge(bridge)) if (is_ovs_bridge(bridge))
return lxc_ovs_attach_bridge(bridge, ifname); return lxc_ovs_attach_bridge(bridge, ifname);
fd = socket(AF_INET, SOCK_STREAM, 0); fd = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0);
if (fd < 0) if (fd < 0)
return -errno; return -errno;
@ -2292,7 +2292,7 @@ int setup_private_host_hw_addr(char *veth1)
int err, sockfd; int err, sockfd;
struct ifreq ifr; struct ifreq ifr;
sockfd = socket(AF_INET, SOCK_DGRAM, 0); sockfd = socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
if (sockfd < 0) if (sockfd < 0)
return -errno; return -errno;
@ -3191,7 +3191,7 @@ static int setup_hw_addr(char *hwaddr, const char *ifname)
ifr.ifr_name[IFNAMSIZ-1] = '\0'; ifr.ifr_name[IFNAMSIZ-1] = '\0';
memcpy((char *) &ifr.ifr_hwaddr, (char *) &sockaddr, sizeof(sockaddr)); memcpy((char *) &ifr.ifr_hwaddr, (char *) &sockaddr, sizeof(sockaddr));
fd = socket(AF_INET, SOCK_DGRAM, 0); fd = socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
if (fd < 0) if (fd < 0)
return -1; return -1;

2
src/lxc/nl.c
View File

@ -295,7 +295,7 @@ extern int netlink_open(struct nl_handler *handler, int protocol)
memset(handler, 0, sizeof(*handler)); memset(handler, 0, sizeof(*handler));
handler->fd = socket(AF_NETLINK, SOCK_RAW, protocol); handler->fd = socket(AF_NETLINK, SOCK_RAW | SOCK_CLOEXEC, protocol);
if (handler->fd < 0) if (handler->fd < 0)
return -errno; return -errno;