Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lxc
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
lxc
Commits
45760f62
Unverified
Commit
45760f62
authored
May 03, 2019
by
Christian Brauner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tree-wide: make socket SOCK_CLOEXEC
Signed-off-by:
Christian Brauner
<
christian.brauner@ubuntu.com
>
parent
0dfb9453
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
af_unix.c
src/lxc/af_unix.c
+3
-3
network.c
src/lxc/network.c
+3
-3
nl.c
src/lxc/nl.c
+1
-1
No files found.
src/lxc/af_unix.c
View file @
45760f62
...
@@ -81,7 +81,7 @@ int lxc_abstract_unix_open(const char *path, int type, int flags)
...
@@ -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)
...
@@ -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
;
...
@@ -351,7 +351,7 @@ int lxc_unix_connect(struct sockaddr_un *addr)
...
@@ -351,7 +351,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
;
...
...
src/lxc/network.c
View file @
45760f62
...
@@ -1939,7 +1939,7 @@ int lxc_bridge_attach(const char *bridge, const char *ifname)
...
@@ -1939,7 +1939,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
;
...
@@ -2043,7 +2043,7 @@ int setup_private_host_hw_addr(char *veth1)
...
@@ -2043,7 +2043,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
;
...
@@ -2779,7 +2779,7 @@ static int setup_hw_addr(char *hwaddr, const char *ifname)
...
@@ -2779,7 +2779,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
;
...
...
src/lxc/nl.c
View file @
45760f62
...
@@ -295,7 +295,7 @@ extern int netlink_open(struct nl_handler *handler, int protocol)
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment