From patchwork Thu Jan 21 23:46:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Borkmann X-Patchwork-Id: 571385 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A999F14031D for ; Fri, 22 Jan 2016 10:46:36 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750887AbcAUXqd (ORCPT ); Thu, 21 Jan 2016 18:46:33 -0500 Received: from www62.your-server.de ([213.133.104.62]:58972 "EHLO www62.your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750758AbcAUXqb (ORCPT ); Thu, 21 Jan 2016 18:46:31 -0500 Received: from [178.194.100.72] (helo=localhost) by www62.your-server.de with esmtpsa (TLSv1.2:DHE-RSA-AES128-GCM-SHA256:128) (Exim 4.80.1) (envelope-from ) id 1aMOvu-00026w-9E; Fri, 22 Jan 2016 00:46:30 +0100 From: Daniel Borkmann To: stephen@networkplumber.org Cc: netdev@vger.kernel.org, alexei.starovoitov@gmail.com, Daniel Borkmann Subject: [PATCH iproute2 -master] tc, bpf: make sure relo is in relation with map section Date: Fri, 22 Jan 2016 00:46:28 +0100 Message-Id: <6f06b68f62c89489ec1afea5ba1c328ef51efd10.1453418999.git.daniel@iogearbox.net> X-Mailer: git-send-email 1.9.3 X-Authenticated-Sender: daniel@iogearbox.net X-Virus-Scanned: Clear (ClamAV 0.98.7/21287/Thu Jan 21 22:23:31 2016) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Acked-by: Alexei Starovoitov --- 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))