History

bpf, x86: Set header->size properly before freeing it

On do_jit failure path, the header is freed by bpf_jit_binary_pack_free. While bpf_jit_binary_pack_free doesn't require proper ro_header->size, bpf_prog_pack_free still uses it. Set header->size in bpf_int_jit_compile before calling bpf_jit_binary_pack_free.

Song Liu committed 4 years ago

Commit 676b2da1 parent eed1fce2 files · +10 −4Browse files

Unified · Split

2 files
  1. arch/x86/net/bpf_jit_comp.c +4 −1
  2. kernel/bpf/core.c +6 −3
arch/x86/net/bpf_jit_comp.c+4−1
@@ -2330,8 +2330,11 @@ skip_init_addrs: · 2329 unmodified lines
23302330 if (proglen <= 0) {
23312331 out_image:
23322332 image = NULL;
2333− if (header)
2333+ if (header) {
2334+ bpf_arch_text_copy(&header->size, &rw_header->size,
2335+ sizeof(rw_header->size));
23342336 bpf_jit_binary_pack_free(header, rw_header);
2337+ }
23352338 prog = orig_prog;
23362339 goto out_addrs;
23372340 }
kernel/bpf/core.c+6−3
@@ -1112,13 +1112,16 @@ int bpf_jit_binary_pack_finalize(struct bpf_prog *prog, · 1111 unmodified lines
11121112 * 1) when the program is freed after;
11131113 * 2) when the JIT engine fails (before bpf_jit_binary_pack_finalize).
11141114 * For case 2), we need to free both the RO memory and the RW buffer.
1115− * Also, ro_header->size in 2) is not properly set yet, so rw_header->size
1116− * is used for uncharge.
1115+ *
1116+ * bpf_jit_binary_pack_free requires proper ro_header->size. However,
1117+ * bpf_jit_binary_pack_alloc does not set it. Therefore, ro_header->size
1118+ * must be set with either bpf_jit_binary_pack_finalize (normal path) or
1119+ * bpf_arch_text_copy (when jit fails).
11171120 */
11181121 void bpf_jit_binary_pack_free(struct bpf_binary_header *ro_header,
11191122 struct bpf_binary_header *rw_header)
11201123 {
1121− u32 size = rw_header ? rw_header->size : ro_header->size;
1124+ u32 size = ro_header->size;
11221125
11231126 bpf_prog_pack_free(ro_header);
11241127 kvfree(rw_header);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t