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

Merge pull request #3476 from brauner/2020-07-05/fixes

Browse Source 
cgroups: handle empty bpf log buffer
This commit is contained in:
Stéphane Graber 2020-07-05 15:24:23 -04:00 committed by GitHub
commit 3e519859bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/lxc/cgroups/cgroup2_devices.c
View File

@ -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;
} }