]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Merge branch 'bpf-bpftool-fixes'
authorDaniel Borkmann <daniel@iogearbox.net>
Thu, 21 Jun 2018 21:07:13 +0000 (23:07 +0200)
committerDaniel Borkmann <daniel@iogearbox.net>
Thu, 21 Jun 2018 21:07:14 +0000 (23:07 +0200)
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>

Trivial merge