From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jakub Kicinski Subject: [PATCH bpf 1/2] tools: bpftool: maps: close json array on error paths of show Date: Fri, 22 Dec 2017 11:36:05 -0800 Message-ID: <20171222193606.19786-2-jakub.kicinski@netronome.com> References: <20171222193606.19786-1-jakub.kicinski@netronome.com> Cc: oss-drivers@netronome.com, Jakub Kicinski To: netdev@vger.kernel.org, daniel@iogearbox.net, alexei.starovoitov@gmail.com Return-path: Received: from mail-pf0-f193.google.com ([209.85.192.193]:37407 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756237AbdLVTgu (ORCPT ); Fri, 22 Dec 2017 14:36:50 -0500 Received: by mail-pf0-f193.google.com with SMTP id n6so15672838pfa.4 for ; Fri, 22 Dec 2017 11:36:50 -0800 (PST) In-Reply-To: <20171222193606.19786-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org List-ID: We can't return from the middle of do_show(), because json_array will not be closed. Break out of the loop. Note that the error handling after the loop depends on errno, so no need to set err. Fixes: 831a0aafe5c3 ("tools: bpftool: add JSON output for `bpftool map *` commands") Signed-off-by: Jakub Kicinski Acked-by: Quentin Monnet --- tools/bpf/bpftool/map.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/bpf/bpftool/map.c b/tools/bpf/bpftool/map.c index e2450c8e88e6..8368b7ea31b5 100644 --- a/tools/bpf/bpftool/map.c +++ b/tools/bpf/bpftool/map.c @@ -523,21 +523,21 @@ static int do_show(int argc, char **argv) break; p_err("can't get next map: %s%s", strerror(errno), errno == EINVAL ? " -- kernel too old?" : ""); - return -1; + break; } fd = bpf_map_get_fd_by_id(id); if (fd < 0) { p_err("can't get map by id (%u): %s", id, strerror(errno)); - return -1; + break; } err = bpf_obj_get_info_by_fd(fd, &info, &len); if (err) { p_err("can't get map info: %s", strerror(errno)); close(fd); - return -1; + break; } if (json_output) -- 2.15.1