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=-13.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 0AFA2C433E0 for ; Fri, 24 Jul 2020 09:06:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D82062074F for ; Fri, 24 Jul 2020 09:06:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=isovalent-com.20150623.gappssmtp.com header.i=@isovalent-com.20150623.gappssmtp.com header.b="jZYU8ziU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726801AbgGXJGl (ORCPT ); Fri, 24 Jul 2020 05:06:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53034 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726783AbgGXJGk (ORCPT ); Fri, 24 Jul 2020 05:06:40 -0400 Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92818C0619E5 for ; Fri, 24 Jul 2020 02:06:40 -0700 (PDT) Received: by mail-wr1-x444.google.com with SMTP id z18so4048031wrm.12 for ; Fri, 24 Jul 2020 02:06:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=isovalent-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GxnENee526BbPSGY0XIg65zijlPPPf1JtIkirCUkaeM=; b=jZYU8ziUDsm6BLSBzqtCVam8YZrRh70sG8YF1AnDFCuQORNHbvnOSD8Gj5IkMI3KWu 9rM1IfyqlbJ5Ae3dztZpC0SmHcn2vPrRIhJ3IzrBMt7qMAiZ+HPdKDqY/AP4odMKbV2o rnnqLmlGY7p3jsSaw8JtS9Wy6IYB3E7I3bkqCEOr0Owxrwa2SKg3GFzWjjsK3GCy7kdu QMZSRjseaHK3idSPGrSZLP7qI8/11vlMW2CH+CoA9Hu3XplpyZHIegqJ8Es0uEIV2NXO L+3xUDG8SnxmpIC44G/ujkacS8evrpLHo9Bkuo4eLxJzJPp0/5ac/65e9IqBrZi6HUC/ LaEA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=GxnENee526BbPSGY0XIg65zijlPPPf1JtIkirCUkaeM=; b=HZTuPsbnondFA3ldtLr1tVdeCW8IS9lcA3jviXse3skhmOqsNiu+vKN1u3QDi+bC/c Y6+3mH6PLfMkJr7ge2IysuH3g5FEoOyiP8P+s6BSj48TkhbFfakoPgC21uFmb7b0FFf3 nuWmFv0eg1cfWsb41SQPimOz1s/z7gowR1g9YxuQlyd1D7E2t1vRWbEavAqTPByV6dt3 E0UksVdhkMR6nRKQr3zLPjIeinFBROY/W+i5477DxBXZxSiEfQWGbxEKY1w1AGwKKzMD iIR66lynhI8LfbBAdet4VwaKkqhJUcFvDHuhY3H573bjEMikFnm9Mxm+sE8jsMI5cPvz lgQw== X-Gm-Message-State: AOAM5321iFTj8M7RvEAYRgBMz6+fShgpfaltuHyaUeETs3O0pYHcD0We ZrK5+OD3ly64G4J/JiAXY08bAA== X-Google-Smtp-Source: ABdhPJykogI7r1ZL819tuTUD/yZ5fQo9cg9lTQkKWDytZ/lmue7R90FEXnSRtTQ2d50zVZ9zSlPF8w== X-Received: by 2002:adf:f248:: with SMTP id b8mr8132157wrp.247.1595581598896; Fri, 24 Jul 2020 02:06:38 -0700 (PDT) Received: from localhost.localdomain ([194.35.117.75]) by smtp.gmail.com with ESMTPSA id t11sm527915wrs.66.2020.07.24.02.06.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 02:06:38 -0700 (PDT) From: Quentin Monnet To: Alexei Starovoitov , Daniel Borkmann Cc: bpf@vger.kernel.org, netdev@vger.kernel.org, Paul Chaignon , Quentin Monnet Subject: [PATCH bpf-next 1/2] tools: bpftool: skip type probe if name is not found Date: Fri, 24 Jul 2020 10:06:17 +0100 Message-Id: <20200724090618.16378-2-quentin@isovalent.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724090618.16378-1-quentin@isovalent.com> References: <20200724090618.16378-1-quentin@isovalent.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org For probing program and map types, bpftool loops on type values and uses the relevant type name in prog_type_name[] or map_type_name[]. To ensure the name exists, we exit from the loop if we go over the size of the array. However, this is not enough in the case where the arrays have "holes" in them, program or map types for which they have no name, but not at the end of the list. This is currently the case for BPF_PROG_TYPE_LSM, not known to bpftool and which name is a null string. When probing for features, bpftool attempts to strlen() that name and segfaults. Let's fix it by skipping probes for "unknown" program and map types, with an informational message giving the numeral value in that case. Fixes: 93a3545d812a ("tools/bpftool: Add name mappings for SK_LOOKUP prog and attach type") Reported-by: Paul Chaignon Signed-off-by: Quentin Monnet --- tools/bpf/bpftool/feature.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/bpf/bpftool/feature.c b/tools/bpf/bpftool/feature.c index 1cd75807673e..a43a6f10b564 100644 --- a/tools/bpf/bpftool/feature.c +++ b/tools/bpf/bpftool/feature.c @@ -504,6 +504,10 @@ probe_prog_type(enum bpf_prog_type prog_type, bool *supported_types, supported_types[prog_type] |= res; + if (!prog_type_name[prog_type]) { + p_info("program type name not found (type %d)", prog_type); + return; + } maxlen = sizeof(plain_desc) - strlen(plain_comment) - 1; if (strlen(prog_type_name[prog_type]) > maxlen) { p_info("program type name too long"); @@ -533,6 +537,10 @@ probe_map_type(enum bpf_map_type map_type, const char *define_prefix, * check required for unprivileged users */ + if (!map_type_name[map_type]) { + p_info("map type name not found (type %d)", map_type); + return; + } maxlen = sizeof(plain_desc) - strlen(plain_comment) - 1; if (strlen(map_type_name[map_type]) > maxlen) { p_info("map type name too long"); -- 2.20.1