Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f58e58e authored by Alexei Starovoitov's avatar Alexei Starovoitov
Browse files

Merge branch 'x86-bpf-jit-fixes' 



Daniel Borkmann says:

====================
Fix two memory leaks in x86 JIT. For details, please see
individual patches in this series. Thanks!
====================

Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parents a4e21ff8 39f56ca9

arch/x86/net/bpf_jit_comp.c

+3 −3
Original line number Diff line number Diff line
@@ -1236,6 +1236,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) 
	for (pass = 0; pass < 20 || image; pass++) {

		proglen = do_jit(prog, addrs, image, oldproglen, &ctx);

		if (proglen <= 0) {

out_image:

			image = NULL;

			if (header)

				bpf_jit_binary_free(header);
@@ -1246,8 +1247,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) 
			if (proglen != oldproglen) {

				pr_err("bpf_jit: proglen=%d != oldproglen=%d\n",

				       proglen, oldproglen);

				prog = orig_prog;

				goto out_addrs;

				goto out_image;

			}

			break;

		}
@@ -1283,7 +1283,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) 
		prog = orig_prog;

	}



	if (!prog->is_func || extra_pass) {

	if (!image || !prog->is_func || extra_pass) {

out_addrs:

		kfree(addrs);

		kfree(jit_data);