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
af5c9517
Unverified
Commit
af5c9517
authored
Jul 05, 2020
by
Christian Brauner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cgroups: handle empty bpf log buffer
Link:
https://launchpadlibrarian.net/487274879/buildlog_ubuntu-eoan-amd64.lxc_1:4.0.3+master~20200705-1541-0ubuntu1~eoan_BUILDING.txt.gz
Signed-off-by:
Christian Brauner
<
christian.brauner@ubuntu.com
>
parent
3b5796aa
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
9 deletions
+13
-9
cgroup2_devices.c
src/lxc/cgroups/cgroup2_devices.c
+13
-9
No files found.
src/lxc/cgroups/cgroup2_devices.c
View file @
af5c9517
...
@@ -325,26 +325,30 @@ static int bpf_program_load_kernel(struct bpf_program *prog, char *log_buf,
...
@@ -325,26 +325,30 @@ static int bpf_program_load_kernel(struct bpf_program *prog, char *log_buf,
{
{
union
bpf_attr
attr
;
union
bpf_attr
attr
;
if
((
log_size
!=
0
&&
!
log_buf
)
||
(
log_size
==
0
&&
log_buf
))
return
ret_errno
(
EINVAL
);
if
(
prog
->
kernel_fd
>=
0
)
{
if
(
prog
->
kernel_fd
>=
0
)
{
memset
(
log_buf
,
0
,
log_size
);
memset
(
log_buf
,
0
,
log_size
);
return
0
;
return
0
;
}
}
attr
=
(
union
bpf_attr
){
attr
=
(
union
bpf_attr
){
.
prog_type
=
prog
->
prog_type
,
.
prog_type
=
prog
->
prog_type
,
.
insns
=
PTR_TO_UINT64
(
prog
->
instructions
),
.
insns
=
PTR_TO_UINT64
(
prog
->
instructions
),
.
insn_cnt
=
prog
->
n_instructions
,
.
insn_cnt
=
prog
->
n_instructions
,
.
license
=
PTR_TO_UINT64
(
"GPL"
),
.
license
=
PTR_TO_UINT64
(
"GPL"
),
.
log_buf
=
PTR_TO_UINT64
(
log_buf
),
.
log_buf
=
PTR_TO_UINT64
(
log_buf
),
.
log_level
=
log_level
,
.
log_level
=
log_level
,
.
log_size
=
log_size
,
.
log_size
=
log_size
,
};
};
prog
->
kernel_fd
=
bpf
(
BPF_PROG_LOAD
,
&
attr
,
sizeof
(
attr
));
prog
->
kernel_fd
=
bpf
(
BPF_PROG_LOAD
,
&
attr
,
sizeof
(
attr
));
if
(
prog
->
kernel_fd
<
0
)
if
(
prog
->
kernel_fd
<
0
)
return
log_error_errno
(
-
1
,
errno
,
"Failed to load bpf program: %s"
,
log_buf
);
return
log_error_errno
(
-
1
,
errno
,
"Failed to load bpf program: %s"
,
log_buf
?:
"(null)"
);
TRACE
(
"Loaded bpf program: %s"
,
log_buf
);
TRACE
(
"Loaded bpf program: %s"
,
log_buf
?:
"(null)"
);
return
0
;
return
0
;
}
}
...
...
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