From patchwork Wed Nov 29 01:44:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 842389 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="EPdNMwWc"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ymjzX6Mwdz9sBd for ; Wed, 29 Nov 2017 12:45:44 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753502AbdK2Bpm (ORCPT ); Tue, 28 Nov 2017 20:45:42 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:36635 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753458AbdK2Bpg (ORCPT ); Tue, 28 Nov 2017 20:45:36 -0500 Received: by mail-pf0-f195.google.com with SMTP id p84so813359pfd.3 for ; Tue, 28 Nov 2017 17:45:36 -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:in-reply-to:references; bh=+OAtpVnuP7skddqRs0Ozse+E1ZJk0vuDK3pzakv7+QQ=; b=EPdNMwWcdeMZSDSkZFuumIsBGItI13vsAj2NTpGYlbtAIrKWgDpnSQwP6odgWxRPDS ioN1kPQrTvS4vf1u87W2i/7wsgEiSbaqOoUrwcHzyNBDOzZjaarhOhTFEgwXkxAlC3EU q6Fk0WzCgxqRc0bgTJq6qxIiHJZ3pJ/jYjdr58NlJdFFU7zRgzsf7UxR8LYo1mX/TzKf wQWV8OaM39v7XhAMHoIvx1Ovxrvx9NERpKE/uLvybTWOn+VlXgX/fOrA/inVF/Q1ayok XItUCEY4gsPeS37QZeWOJ6Dw24YKKo6ZFYqK+qn+70dYteGI04YfxzWzuzkCB2NUhBgQ fMwg== 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; bh=+OAtpVnuP7skddqRs0Ozse+E1ZJk0vuDK3pzakv7+QQ=; b=Hhm12eYh9RH4W+9FeZq7wsc/HYcXVy0DVg2DE1U0tUvYIGdJM+9iRBWCHxzj9eWEpV qNaJSqTsNLAb1OR7y9/Wdz8ySGMq/YGI/h197/z9NjzqWietNggTwhHoZyq2TpJEUc4P ulRiJqfYxXkbY/MXDMU3hIBsNVqg1N8BtT1wbN+t2iRg3DESpruyZNTOIOyKEmRHD1yA 1133GCnDydVAHFaMVoOodpWtjGIUDi4EbrvkJpiv1eyBWeMQOpYhVyDQ+HhCcPG+lwhO JUgXfs0BLFxbY0TF4K56YasYu+3ou+0/4f2iZHXAlLj8UHIGLnCA4FgCPp0ZgABxFQ2R B6zg== X-Gm-Message-State: AJaThX4mlFjsAbODXCQsUSqiEkQx+pV5/XKZaZReUCDOdSjaXK1LXMll 30C3ZUhfIZwg1gX5a3Sf8I8Tf5X+ X-Google-Smtp-Source: AGs4zMZz2dyXc1XeqDIlI1NLLtOvURD6U8gB1n8QH8f8Z+ZWBo9l9NRJ3lT4V3dNs2eXyf2sSOy6dg== X-Received: by 10.101.69.76 with SMTP id x12mr1189573pgr.284.1511919936083; Tue, 28 Nov 2017 17:45:36 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id f79sm495625pfd.45.2017.11.28.17.45.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Nov 2017 17:45:35 -0800 (PST) From: Jakub Kicinski To: netdev@vger.kernel.org Cc: oss-drivers@netronome.com, Quentin Monnet Subject: [PATCH net 1/6] tools: bpftool: fix crash on bad parameters with JSON Date: Tue, 28 Nov 2017 17:44:28 -0800 Message-Id: <20171129014434.31694-2-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171129014434.31694-1-jakub.kicinski@netronome.com> References: <20171129014434.31694-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Quentin Monnet If bad or unrecognised parameters are specified after JSON output is requested, `usage()` will try to output null JSON object before the writer is created. To prevent this, create the writer as soon as the `--json` option is parsed. Fixes: 004b45c0e51a ("tools: bpftool: provide JSON output for all possible commands") Reported-by: Jakub Kicinski Signed-off-by: Quentin Monnet Acked-by: Jakub Kicinski --- tools/bpf/bpftool/main.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/tools/bpf/bpftool/main.c b/tools/bpf/bpftool/main.c index d6e4762170a4..14ad54a1c404 100644 --- a/tools/bpf/bpftool/main.c +++ b/tools/bpf/bpftool/main.c @@ -291,7 +291,15 @@ int main(int argc, char **argv) pretty_output = true; /* fall through */ case 'j': - json_output = true; + if (!json_output) { + json_wtr = jsonw_new(stdout); + if (!json_wtr) { + p_err("failed to create JSON writer"); + return -1; + } + json_output = true; + } + jsonw_pretty(json_wtr, pretty_output); break; case 'f': show_pinned = true; @@ -306,15 +314,6 @@ int main(int argc, char **argv) if (argc < 0) usage(); - if (json_output) { - json_wtr = jsonw_new(stdout); - if (!json_wtr) { - p_err("failed to create JSON writer"); - return -1; - } - jsonw_pretty(json_wtr, pretty_output); - } - bfd_init(); ret = cmd_select(cmds, argc, argv, do_help);