]> asedeno.scripts.mit.edu Git - linux.git/commit
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)
commitf2e72a0b79a03c4046f08515d1479f613f2eb139
treef8f65c36f80791edb98c219fa98f24c904d28741
parent3739a21e0ef6ac06f46bd38e81daa95e8cb462bc
parentbfee71fb7376081349117fdc89f685a9e14a58c2
Merge branch 'bpf-bpftool-fixes'

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>