Merge branch 'bpf-bpftool-fixes'

Browse source

Jakub Kicinski says:

====================
Two small fixes for error handling in bpftool prog load, first patch
removes a duplicated message, second one frees resources correctly.
Multiple error messages break JSON:

{
    "error": "can't pin the object (/sys/fs/bpf/a): File exists"
},{
    "error": "failed to pin program"
}
====================

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

...

This commit is contained in:

Daniel Borkmann 2018-06-21 23:07:13 +02:00

parent 3739a21e0e bfee71fb73

commit f2e72a0b79

1 changed files with 8 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

12

tools/bpf/bpftool/prog.c

View file