From: Daniel Borkmann <daniel@iogearbox.net>
To: ast@kernel.org
Cc: netdev@vger.kernel.org, Daniel Borkmann <daniel@iogearbox.net>,
Martin Schwidefsky <schwidefsky@de.ibm.com>
Subject: [PATCH bpf 2/3] bpf, s390: fix potential memleak when later bpf_jit_prog fails
Date: Thu, 28 Jun 2018 23:34:58 +0200 [thread overview]
Message-ID: <20180628213459.28631-3-daniel@iogearbox.net> (raw)
In-Reply-To: <20180628213459.28631-1-daniel@iogearbox.net>
If we would ever fail in the bpf_jit_prog() pass that writes the
actual insns to the image after we got header via bpf_jit_binary_alloc()
then we also need to make sure to free it through bpf_jit_binary_free()
again when bailing out. Given we had prior bpf_jit_prog() passes to
initially probe for clobbered registers, program size and to fill in
addrs arrray for jump targets, this is more of a theoretical one,
but at least make sure this doesn't break with future changes.
Fixes: 054623105728 ("s390/bpf: Add s390x eBPF JIT compiler backend")
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Acked-by: Alexei Starovoitov <ast@kernel.org>
---
arch/s390/net/bpf_jit_comp.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c
index d2db8ac..5f0234e 100644
--- a/arch/s390/net/bpf_jit_comp.c
+++ b/arch/s390/net/bpf_jit_comp.c
@@ -1286,6 +1286,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp)
goto free_addrs;
}
if (bpf_jit_prog(&jit, fp)) {
+ bpf_jit_binary_free(header);
fp = orig_fp;
goto free_addrs;
}
--
2.9.5
next prev parent reply other threads:[~2018-06-28 21:35 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-28 21:34 [PATCH bpf 0/3] Three BPF fixes Daniel Borkmann
2018-06-28 21:34 ` [PATCH bpf 1/3] bpf, arm32: fix to use bpf_jit_binary_lock_ro api Daniel Borkmann
2018-06-28 21:34 ` Daniel Borkmann [this message]
2018-06-28 21:34 ` [PATCH bpf 3/3] bpf: undo prog rejection on read-only lock failure Daniel Borkmann
2018-06-29 18:42 ` Kees Cook
2018-06-29 23:47 ` Daniel Borkmann
2018-07-02 18:48 ` Kees Cook
2018-07-02 21:12 ` Daniel Borkmann
2018-06-29 17:54 ` [PATCH bpf 0/3] Three BPF fixes Alexei Starovoitov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180628213459.28631-3-daniel@iogearbox.net \
--to=daniel@iogearbox.net \
--cc=ast@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=schwidefsky@de.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).