netdev - [PATCH iproute2 -master] tc, bpf: make sure relo is in relation with map section

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 22 Jan 2016 00:46:28 +0100
From:	Daniel Borkmann <daniel@...earbox.net>
To:	stephen@...workplumber.org
Cc:	netdev@...r.kernel.org, alexei.starovoitov@...il.com,
	Daniel Borkmann <daniel@...earbox.net>
Subject: [PATCH iproute2 -master] tc, bpf: make sure relo is in relation with map section

Add a test that symbol from relocation entry is actually related
to map section and bail out with an error message if it's not the
case; in relation to [1].

  [1] https://llvm.org/bugs/show_bug.cgi?id=26243

Signed-off-by: Daniel Borkmann <daniel@...earbox.net>
---
 tc/tc_bpf.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tc/tc_bpf.c b/tc/tc_bpf.c
index 219ffa5..3c97cdb 100644
--- a/tc/tc_bpf.c
+++ b/tc/tc_bpf.c
@@ -1336,6 +1336,12 @@ static int bpf_apply_relo_data(struct bpf_elf_ctx *ctx,
 
 		if (gelf_getsym(ctx->sym_tab, GELF_R_SYM(relo.r_info), &sym) != &sym)
 			return -EIO;
+		if (sym.st_shndx != ctx->sec_maps) {
+			fprintf(stderr, "ELF contains non-map related relo data in "
+				"entry %u pointing to section %u! Compiler bug?!\n",
+				relo_ent, sym.st_shndx);
+			return -EIO;
+		}
 
 		rmap = sym.st_value / sizeof(struct bpf_elf_map);
 		if (rmap >= ARRAY_SIZE(ctx->map_fds))
-- 
1.9.3