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
8d3bcf63
Unverified
Commit
8d3bcf63
authored
Oct 16, 2020
by
Christian Brauner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
seccomp: fix compilation on powerpc
Link:
https://launchpadlibrarian.net/502200189/buildlog_snap_ubuntu_bionic_ppc64el_lxd-latest-edge_BUILDING.txt.gz
Signed-off-by:
Christian Brauner
<
christian.brauner@ubuntu.com
>
parent
6778323d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
7 deletions
+12
-7
seccomp.c
src/lxc/seccomp.c
+12
-7
No files found.
src/lxc/seccomp.c
View file @
8d3bcf63
...
@@ -1351,9 +1351,11 @@ static void seccomp_notify_default_answer(int fd, struct seccomp_notif *req,
...
@@ -1351,9 +1351,11 @@ static void seccomp_notify_default_answer(int fd, struct seccomp_notif *req,
resp
->
flags
=
0
;
resp
->
flags
=
0
;
if
(
seccomp_notify_respond
(
fd
,
resp
))
if
(
seccomp_notify_respond
(
fd
,
resp
))
SYSERROR
(
"Failed to send default message to seccomp notification with id(%llu)"
,
resp
->
id
);
SYSERROR
(
"Failed to send default message to seccomp notification with id(%llu)"
,
(
long
long
unsigned
int
)
resp
->
id
);
else
else
TRACE
(
"Sent default response for seccomp notification with id(%llu)"
,
resp
->
id
);
TRACE
(
"Sent default response for seccomp notification with id(%llu)"
,
(
long
long
unsigned
int
)
resp
->
id
);
memset
(
resp
,
0
,
handler
->
conf
->
seccomp
.
notifier
.
sizes
.
seccomp_notif_resp
);
memset
(
resp
,
0
,
handler
->
conf
->
seccomp
.
notifier
.
sizes
.
seccomp_notif_resp
);
}
}
#endif
#endif
...
@@ -1414,7 +1416,7 @@ int seccomp_notify_handler(int fd, uint32_t events, void *data,
...
@@ -1414,7 +1416,7 @@ int seccomp_notify_handler(int fd, uint32_t events, void *data,
/* remember the ID in case we receive garbage from the proxy */
/* remember the ID in case we receive garbage from the proxy */
resp
->
id
=
req_id
=
req
->
id
;
resp
->
id
=
req_id
=
req
->
id
;
TRACE
(
"Received seccomp notification with id(%llu)"
,
req_id
);
TRACE
(
"Received seccomp notification with id(%llu)"
,
(
long
long
unsigned
int
)
req_id
);
snprintf
(
mem_path
,
sizeof
(
mem_path
),
"/proc/%d"
,
req
->
pid
);
snprintf
(
mem_path
,
sizeof
(
mem_path
),
"/proc/%d"
,
req
->
pid
);
fd_pid
=
open
(
mem_path
,
O_RDONLY
|
O_DIRECTORY
|
O_CLOEXEC
);
fd_pid
=
open
(
mem_path
,
O_RDONLY
|
O_DIRECTORY
|
O_CLOEXEC
);
...
@@ -1439,7 +1441,7 @@ int seccomp_notify_handler(int fd, uint32_t events, void *data,
...
@@ -1439,7 +1441,7 @@ int seccomp_notify_handler(int fd, uint32_t events, void *data,
ret
=
seccomp_notify_id_valid
(
fd
,
req
->
id
);
ret
=
seccomp_notify_id_valid
(
fd
,
req
->
id
);
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
seccomp_notify_default_answer
(
fd
,
req
,
resp
,
hdlr
);
seccomp_notify_default_answer
(
fd
,
req
,
resp
,
hdlr
);
SYSERROR
(
"Invalid seccomp notify request id(%llu)"
,
req
->
id
);
SYSERROR
(
"Invalid seccomp notify request id(%llu)"
,
(
long
long
unsigned
int
)
req
->
id
);
goto
out
;
goto
out
;
}
}
...
@@ -1498,7 +1500,8 @@ retry:
...
@@ -1498,7 +1500,8 @@ retry:
}
}
if
(
resp
->
id
!=
req_id
)
{
if
(
resp
->
id
!=
req_id
)
{
ERROR
(
"Proxy returned response with illegal id(%llu) != id(%llu)"
,
resp
->
id
,
req_id
);
ERROR
(
"Proxy returned response with illegal id(%llu) != id(%llu)"
,
(
long
long
unsigned
int
)
resp
->
id
,
(
long
long
unsigned
int
)
req_id
);
resp
->
id
=
req_id
;
resp
->
id
=
req_id
;
seccomp_notify_default_answer
(
fd
,
req
,
resp
,
hdlr
);
seccomp_notify_default_answer
(
fd
,
req
,
resp
,
hdlr
);
goto
out
;
goto
out
;
...
@@ -1512,7 +1515,8 @@ retry:
...
@@ -1512,7 +1515,8 @@ retry:
}
}
if
(
resp
->
id
!=
req_id
)
{
if
(
resp
->
id
!=
req_id
)
{
ERROR
(
"Proxy returned response with illegal id(%llu) != id(%llu)"
,
resp
->
id
,
req_id
);
ERROR
(
"Proxy returned response with illegal id(%llu) != id(%llu)"
,
(
long
long
unsigned
int
)
resp
->
id
,
(
long
long
unsigned
int
)
req_id
);
resp
->
id
=
req_id
;
resp
->
id
=
req_id
;
}
}
...
@@ -1520,7 +1524,8 @@ retry:
...
@@ -1520,7 +1524,8 @@ retry:
if
(
ret
)
if
(
ret
)
SYSERROR
(
"Failed to send seccomp notification"
);
SYSERROR
(
"Failed to send seccomp notification"
);
else
else
TRACE
(
"Sent response for seccomp notification with id(%llu)"
,
resp
->
id
);
TRACE
(
"Sent response for seccomp notification with id(%llu)"
,
(
long
long
unsigned
int
)
resp
->
id
);
memset
(
resp
,
0
,
conf
->
seccomp
.
notifier
.
sizes
.
seccomp_notif_resp
);
memset
(
resp
,
0
,
conf
->
seccomp
.
notifier
.
sizes
.
seccomp_notif_resp
);
out:
out:
...
...
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