提交 b2566a71 编写于 作者: A Arnaldo Carvalho de Melo 提交者: Zheng Zengkai

perf llvm: Return -ENOMEM when asprintf() fails

stable inclusion
from stable-5.10.50
commit 8ff266de8906e20d6555bae24900f76021310129
bugzilla: 174522 https://gitee.com/openeuler/kernel/issues/I4DNFY

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=8ff266de8906e20d6555bae24900f76021310129

--------------------------------

[ Upstream commit c435c166 ]

Zhihao sent a patch but it made llvm__compile_bpf() return what
asprintf() returns on error, which is just -1, but since this function
returns -errno, fix it by returning -ENOMEM for this case instead.

Fixes: cb763714 ("perf llvm: Allow passing options to llc ...")
Fixes: 5eab5a7e ("perf llvm: Display eBPF compiling command ...")
Reported-by: NHulk Robot <hulkci@huawei.com>
Reported-by: NZhihao Cheng <chengzhihao1@huawei.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Andrii Nakryiko <andrii@kernel.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Yu Kuai <yukuai3@huawei.com>
Cc: clang-built-linux@googlegroups.com
Link: http://lore.kernel.org/lkml/20210609115945.2193194-1-chengzhihao1@huawei.comSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NWeilong Chen <chenweilong@huawei.com>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 0fc92672
...@@ -504,6 +504,7 @@ int llvm__compile_bpf(const char *path, void **p_obj_buf, ...@@ -504,6 +504,7 @@ int llvm__compile_bpf(const char *path, void **p_obj_buf,
goto errout; goto errout;
} }
err = -ENOMEM;
if (asprintf(&pipe_template, "%s -emit-llvm | %s -march=bpf %s -filetype=obj -o -", if (asprintf(&pipe_template, "%s -emit-llvm | %s -march=bpf %s -filetype=obj -o -",
template, llc_path, opts) < 0) { template, llc_path, opts) < 0) {
pr_err("ERROR:\tnot enough memory to setup command line\n"); pr_err("ERROR:\tnot enough memory to setup command line\n");
...@@ -524,6 +525,7 @@ int llvm__compile_bpf(const char *path, void **p_obj_buf, ...@@ -524,6 +525,7 @@ int llvm__compile_bpf(const char *path, void **p_obj_buf,
pr_debug("llvm compiling command template: %s\n", template); pr_debug("llvm compiling command template: %s\n", template);
err = -ENOMEM;
if (asprintf(&command_echo, "echo -n \"%s\"", template) < 0) if (asprintf(&command_echo, "echo -n \"%s\"", template) < 0)
goto errout; goto errout;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册