mirror/libbpf
1
0
Fork 0
mirror of https://github.com/netdata/libbpf.git synced 2026-04-05 08:09:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

sync with bpf-next

Browse Source 
Sync with the following bug fix:
  commit a8a1f7d09cfc7e18874786c7634c9e71384fcd4e (HEAD -> bpf-next2, bpf-next/master)
  Author: Stanislav Fomichev <sdf@google.com>
  Date:   Mon Feb 4 16:20:55 2019 -0800

    libbpf: fix libbpf_print

    With the recent print rework we now have the following problem:
    pr_{warning,info,debug} expand to __pr which calls libbpf_print.
    libbpf_print does va_start and calls __libbpf_pr with va_list argument.
    In __base_pr we again do va_start. Because the next argument is a
    va_list, we don't get correct pointer to the argument (and print noting
    in my case, I don't know why it doesn't crash tbh).

    ......

    Signed-off-by: Stanislav Fomichev <sdf@google.com>

Signed-off-by: Yonghong Song <yhs@fb.com>
This commit is contained in:
Yonghong Song
2019-02-04 19:42:31 -08:00
parent 30388a7afd
commit b19c6dcf62
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libbpf.c
View File

@@ -54,22 +54,16 @@
#define __printf(a, b) __attribute__((format(printf, a, b))) #define __printf(a, b) __attribute__((format(printf, a, b)))
__printf(2, 3) static int __base_pr(enum libbpf_print_level level, const char *format,
static int __base_pr(enum libbpf_print_level level, const char *format, ...) va_list args)
{ {
va_list args;
int err;
if (level == LIBBPF_DEBUG) if (level == LIBBPF_DEBUG)
return 0; return 0;
va_start(args, format); return vfprintf(stderr, format, args);
err = vfprintf(stderr, format, args);
va_end(args);
return err;
} }
static __printf(2, 3) libbpf_print_fn_t __libbpf_pr = __base_pr; static libbpf_print_fn_t __libbpf_pr = __base_pr;
void libbpf_set_print(libbpf_print_fn_t fn) void libbpf_set_print(libbpf_print_fn_t fn)
{ {

3
src/libbpf.h
View File

@@ -54,8 +54,7 @@ enum libbpf_print_level {
}; };
typedef int (*libbpf_print_fn_t)(enum libbpf_print_level level, typedef int (*libbpf_print_fn_t)(enum libbpf_print_level level,
const char *, ...) const char *, va_list ap);
__attribute__((format(printf, 2, 3)));
LIBBPF_API void libbpf_set_print(libbpf_print_fn_t fn); LIBBPF_API void libbpf_set_print(libbpf_print_fn_t fn);