From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BED91C282C8 for ; Mon, 28 Jan 2019 18:01:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 76F852175B for ; Mon, 28 Jan 2019 18:01:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="OQrAcarD" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726934AbfA1SBs (ORCPT ); Mon, 28 Jan 2019 13:01:48 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:45237 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726266AbfA1SBr (ORCPT ); Mon, 28 Jan 2019 13:01:47 -0500 Received: by mail-pg1-f194.google.com with SMTP id y4so7515759pgc.12 for ; Mon, 28 Jan 2019 10:01:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NgNu9EyNsUXBWc5Rkkjx7pyEjjjUZ9kL4RP02SSZc+M=; b=OQrAcarDNkVfAm9StAKAVBgnF1x9GvcdI0pP36g9+pAfew8bZaED2BmM3DQcfUG1Q4 eBBMGfVkL6JL2D2Sxb6CkKaGKfHWeRG4UVbfLBcwlTbLd509OMwCOapWJup06Y+9YAm5 xMh3XuZxsg5p8CP8Tz7y3gNXr37f4McTg1eUH+ZXlcmnek/rVqbmvWaAXNgcijl9NmiZ tnDpQM4JbDL73lsE/Zu6fCgzXN1pB7G3ZLA5OTjgILURdrYhvUUr1gjF7moR299pqqTY OodGI1+iwlYYr7ZgEVGAU+6PNIx570ShB9ZrI7krmLq6Wlo9S12nWjX7GksaIS4wFv5K TYhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NgNu9EyNsUXBWc5Rkkjx7pyEjjjUZ9kL4RP02SSZc+M=; b=NlFdea+J6AZ+Kcwb7HXOjWHstn2HVfaQsK6PxTRjarpXuz2h6eSiP5ZYELG6w82q4z O3E7DApdbrVgvic4XaJGnShpNLAPHhvulk0IuXqv83Ged+E0yuUX+HsZyi5DKvZuI34a g+dF8ZLisXc5cWPv00PboDdhz3i619zugUG/3fjUXBqPIwz3HF2OI8b+8pxhCTaM21eF RCESooPZGSC5EgWZSJL2U2NPBuNQjWTN4xohMBRpRZSuwREdqf8olnBrqeeNkFfSGqRJ didJPssnY2Nco+eNLYLzAyCvOzYU7yhtRTAjx3nuoA7vMDdr0e9v6wRwuB1y/Z/KQ8Cg 1rPw== X-Gm-Message-State: AJcUukflC2EsqUNmMbJsnfTm9vJg0DoxDpC32g7FzT+9lJDJgtaGN/VG /IOlNno+NpyCPqNZxSY7ex1a+gAB5gw= X-Google-Smtp-Source: ALg8bN6/Q9nwsn4nG1EEl/B0gydVjk728XtYdFVOr7BhRvq+Pmy71TdFZ2Cp0pl34g65E04+pvItBA== X-Received: by 2002:a63:66c6:: with SMTP id a189mr20739209pgc.167.1548698506881; Mon, 28 Jan 2019 10:01:46 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id w5sm41159205pfn.89.2019.01.28.10.01.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Jan 2019 10:01:46 -0800 (PST) From: Jakub Kicinski To: alexei.starovoitov@gmail.com, daniel@iogearbox.net Cc: oss-drivers@netronome.com, netdev@vger.kernel.org, Jakub Kicinski Subject: [PATCH bpf] tools: bpftool: fix crash with un-owned prog arrays Date: Mon, 28 Jan 2019 10:01:21 -0800 Message-Id: <20190128180121.31362-1-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Prog arrays don't have 'owner_prog_type' and 'owner_jited' fields in their fdinfo when they are created. Those fields are set and reported when first program is checked for compatibility by bpf_prog_array_compatible(). This means that bpftool cannot expect the fields to always be there. Currently trying to show maps on a system with an un-owned prog array leads to a crash: $ bpftool map show 389: prog_array name tail_call_map flags 0x0 Error: key 'owner_prog_type' not found in fdinfo Error: key 'owner_jited' not found in fdinfo key 4B value 4B max_entries 4 memlock 4096B Segmentation fault (core dumped) We pass a NULL pointer to atoi(). Remove the assumption that fdinfo keys are always present. Add missing validations and remove the p_err() calls which may lead to broken JSON output as caller will not propagate the failure. Fixes: 99a44bef5870 ("tools: bpftool: add owner_prog_type and owner_jited to bpftool output") Signed-off-by: Jakub Kicinski Reviewed-by: Quentin Monnet --- tools/bpf/bpftool/common.c | 6 +----- tools/bpf/bpftool/map.c | 17 ++++++++--------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/tools/bpf/bpftool/common.c b/tools/bpf/bpftool/common.c index 897483457bf0..f7261fad45c1 100644 --- a/tools/bpf/bpftool/common.c +++ b/tools/bpf/bpftool/common.c @@ -297,10 +297,8 @@ char *get_fdinfo(int fd, const char *key) snprintf(path, sizeof(path), "/proc/self/fdinfo/%d", fd); fdi = fopen(path, "r"); - if (!fdi) { - p_err("can't open fdinfo: %s", strerror(errno)); + if (!fdi) return NULL; - } while ((n = getline(&line, &line_n, fdi)) > 0) { char *value; @@ -313,7 +311,6 @@ char *get_fdinfo(int fd, const char *key) value = strchr(line, '\t'); if (!value || !value[1]) { - p_err("malformed fdinfo!?"); free(line); return NULL; } @@ -326,7 +323,6 @@ char *get_fdinfo(int fd, const char *key) return line; } - p_err("key '%s' not found in fdinfo", key); free(line); fclose(fdi); return NULL; diff --git a/tools/bpf/bpftool/map.c b/tools/bpf/bpftool/map.c index 29a3468c6cf6..1ef1ee2280a2 100644 --- a/tools/bpf/bpftool/map.c +++ b/tools/bpf/bpftool/map.c @@ -513,10 +513,9 @@ static int show_map_close_json(int fd, struct bpf_map_info *info) jsonw_uint_field(json_wtr, "owner_prog_type", prog_type); } - if (atoi(owner_jited)) - jsonw_bool_field(json_wtr, "owner_jited", true); - else - jsonw_bool_field(json_wtr, "owner_jited", false); + if (owner_jited) + jsonw_bool_field(json_wtr, "owner_jited", + !!atoi(owner_jited)); free(owner_prog_type); free(owner_jited); @@ -569,7 +568,8 @@ static int show_map_close_plain(int fd, struct bpf_map_info *info) char *owner_prog_type = get_fdinfo(fd, "owner_prog_type"); char *owner_jited = get_fdinfo(fd, "owner_jited"); - printf("\n\t"); + if (owner_prog_type || owner_jited) + printf("\n\t"); if (owner_prog_type) { unsigned int prog_type = atoi(owner_prog_type); @@ -579,10 +579,9 @@ static int show_map_close_plain(int fd, struct bpf_map_info *info) else printf("owner_prog_type %d ", prog_type); } - if (atoi(owner_jited)) - printf("owner jited"); - else - printf("owner not jited"); + if (owner_jited) + printf("owner%s jited", + atoi(owner_jited) ? "" : " not"); free(owner_prog_type); free(owner_jited); -- 2.19.2