From patchwork Fri Dec 11 14:22:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaldo Carvalho de Melo X-Patchwork-Id: 58281 Delivered-To: patch@linaro.org Received: by 10.112.157.166 with SMTP id wn6csp168853lbb; Fri, 11 Dec 2015 06:25:00 -0800 (PST) X-Received: by 10.66.62.201 with SMTP id a9mr25186520pas.7.1449843899999; Fri, 11 Dec 2015 06:24:59 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qd3si1541257pab.208.2015.12.11.06.24.59; Fri, 11 Dec 2015 06:24:59 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754889AbbLKOY6 (ORCPT + 28 others); Fri, 11 Dec 2015 09:24:58 -0500 Received: from casper.infradead.org ([85.118.1.10]:47929 "EHLO casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754194AbbLKOXQ (ORCPT ); Fri, 11 Dec 2015 09:23:16 -0500 Received: from [187.65.86.84] (helo=zoo.infradead.org) by casper.infradead.org with esmtpsa (Exim 4.80.1 #2 (Red Hat Linux)) id 1a730s-0003Oe-Sc; Thu, 10 Dec 2015 15:20:11 +0000 Received: by zoo.infradead.org (Postfix, from userid 1000) id 0548C220977; Fri, 11 Dec 2015 11:23:03 -0300 (BRT) From: Arnaldo Carvalho de Melo To: Ingo Molnar Cc: linux-kernel@vger.kernel.org, Wang Nan , Zefan Li , pi3orama@163.com, Arnaldo Carvalho de Melo Subject: [PATCH 5/9] tools lib bpf: Check return value of strdup when reading map names Date: Fri, 11 Dec 2015 11:22:28 -0300 Message-Id: <1449843752-28395-6-git-send-email-acme@kernel.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1449843752-28395-1-git-send-email-acme@kernel.org> References: <1449843752-28395-1-git-send-email-acme@kernel.org> X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wang Nan Commit 561bbccac72d08babafaa33fd7fa9100ec4c9fb6 ("tools lib bpf: Extract and collect map names from BPF object file") forgets checking return value of strdup(). This patch fixes it. It also checks names pointer before strcmp() for safety. Signed-off-by: Wang Nan Acked-by: Namhyung Kim Cc: Zefan Li Cc: pi3orama@163.com Fixes: 561bbccac72d ("tools lib bpf: Extract and collect map names from BPF object file") Link: http://lkml.kernel.org/r/1449541544-67621-2-git-send-email-wangnan0@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/lib/bpf/libbpf.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index a298614ad091..16485ab05fc1 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -527,14 +527,14 @@ bpf_object__init_maps(struct bpf_object *obj, void *data, return 0; } -static void +static int bpf_object__init_maps_name(struct bpf_object *obj, int maps_shndx) { int i; Elf_Data *symbols = obj->efile.symbols; if (!symbols || maps_shndx < 0) - return; + return -EINVAL; for (i = 0; i < symbols->d_size / sizeof(GElf_Sym); i++) { GElf_Sym sym; @@ -556,9 +556,14 @@ bpf_object__init_maps_name(struct bpf_object *obj, int maps_shndx) continue; } obj->maps[map_idx].name = strdup(map_name); + if (!obj->maps[map_idx].name) { + pr_warning("failed to alloc map name\n"); + return -ENOMEM; + } pr_debug("map %zu is \"%s\"\n", map_idx, obj->maps[map_idx].name); } + return 0; } static int bpf_object__elf_collect(struct bpf_object *obj) @@ -663,7 +668,7 @@ static int bpf_object__elf_collect(struct bpf_object *obj) } if (maps_shndx >= 0) - bpf_object__init_maps_name(obj, maps_shndx); + err = bpf_object__init_maps_name(obj, maps_shndx); out: return err; } @@ -1372,7 +1377,7 @@ bpf_object__get_map_by_name(struct bpf_object *obj, const char *name) struct bpf_map *pos; bpf_map__for_each(pos, obj) { - if (strcmp(pos->name, name) == 0) + if (pos->name && !strcmp(pos->name, name)) return pos; } return NULL;