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

Commit 94379648 authored by Daniel Borkmann's avatar Daniel Borkmann Committed by Martin Schwidefsky
Browse files

s390/bpf: remove redundant check for non-null image 



After we already allocated the jit.prg_buf image via
bpf_jit_binary_alloc() and filled it out with instructions,
jit.prg_buf cannot be NULL anymore. Thus, remove the
unnecessary check. Tested on s390x with test_bpf module.

Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Cc: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 21665912

arch/s390/net/bpf_jit_comp.c

+4 −7
Original line number Diff line number Diff line
@@ -1331,14 +1331,11 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp) 
	}

	if (bpf_jit_enable > 1) {

		bpf_jit_dump(fp->len, jit.size, pass, jit.prg_buf);

		if (jit.prg_buf)

		print_fn_code(jit.prg_buf, jit.size_prg);

	}

	if (jit.prg_buf) {

	set_memory_ro((unsigned long)header, header->pages);

	fp->bpf_func = (void *) jit.prg_buf;

	fp->jited = 1;

	}

free_addrs:

	kfree(jit.addrs);

out: