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
a60c98aa
Unverified
Commit
a60c98aa
authored
Nov 02, 2020
by
Christian Brauner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
seccomp: make seccomp notifier fd non-blocking
Suggested-by:
Jann Horn
<
jann@thejh.net
>
Signed-off-by:
Christian Brauner
<
christian.brauner@ubuntu.com
>
parent
7fde74f3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
0 deletions
+16
-0
file_utils.c
src/lxc/file_utils.c
+12
-0
file_utils.h
src/lxc/file_utils.h
+1
-0
seccomp.c
src/lxc/seccomp.c
+3
-0
No files found.
src/lxc/file_utils.c
View file @
a60c98aa
...
...
@@ -577,3 +577,15 @@ int open_beneath(int dir_fd, const char *path, unsigned int flags)
return
openat
(
dir_fd
,
path
,
O_NOFOLLOW
|
flags
);
}
int
fd_make_nonblocking
(
int
fd
)
{
int
flags
;
flags
=
fcntl
(
fd
,
F_GETFL
);
if
(
flags
<
0
)
return
-
1
;
flags
&=
~
O_NONBLOCK
;
return
fcntl
(
fd
,
F_SETFL
,
flags
);
}
src/lxc/file_utils.h
View file @
a60c98aa
...
...
@@ -76,5 +76,6 @@ __hidden extern int timens_offset_write(clockid_t clk_id, int64_t s_offset, int6
__hidden
extern
bool
exists_dir_at
(
int
dir_fd
,
const
char
*
path
);
__hidden
extern
bool
exists_file_at
(
int
dir_fd
,
const
char
*
path
);
__hidden
extern
int
open_beneath
(
int
dir_fd
,
const
char
*
path
,
unsigned
int
flags
);
__hidden
int
fd_make_nonblocking
(
int
fd
);
#endif
/* __LXC_FILE_UTILS_H */
src/lxc/seccomp.c
View file @
a60c98aa
...
...
@@ -1280,6 +1280,9 @@ int lxc_seccomp_load(struct lxc_conf *conf)
return
-
1
;
}
if
(
fd_make_nonblocking
(
ret
))
return
log_error_errno
(
-
1
,
errno
,
"Failed to make seccomp listener fd non-blocking"
);;
conf
->
seccomp
.
notifier
.
notify_fd
=
ret
;
TRACE
(
"Retrieved new seccomp listener fd %d"
,
ret
);
}
...
...
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