From mboxrd@z Thu Jan 1 00:00:00 1970 From: Taeung Song Subject: [PATCH 2/2] tools/bpftool: Fix segfault case regarding 'pin' arguments Date: Wed, 18 Jul 2018 22:35:26 +0900 Message-ID: <20180718133526.19669-2-treeze.taeung@gmail.com> References: <20180718133526.19669-1-treeze.taeung@gmail.com> Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Jakub Kicinski To: Alexei Starovoitov , Daniel Borkmann Return-path: Received: from mail-pf0-f196.google.com ([209.85.192.196]:42199 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730831AbeGRONr (ORCPT ); Wed, 18 Jul 2018 10:13:47 -0400 In-Reply-To: <20180718133526.19669-1-treeze.taeung@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: Arguments of 'pin' subcommand should be checked at the very beginning of do_pin_any(). Otherwise segfault errors can occur when using 'map pin' or 'prog pin' commands, so fix it. # bpftool prog pin id Segmentation fault Fixes: 71bb428fe2c1 ("tools: bpf: add bpftool") Cc: Jakub Kicinski Reported-by: Taehee Yoo Signed-off-by: Taeung Song --- tools/bpf/bpftool/common.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/bpf/bpftool/common.c b/tools/bpf/bpftool/common.c index 32f9e397a6c0..b1e1ba9e1c90 100644 --- a/tools/bpf/bpftool/common.c +++ b/tools/bpf/bpftool/common.c @@ -217,6 +217,14 @@ int do_pin_any(int argc, char **argv, int (*get_fd_by_id)(__u32)) int err; int fd; + if (argc < 3) { + p_err("too few arguments, id PROG_ID and FILE path is required"); + return -1; + } else if (argc > 3) { + p_err("too many arguments"); + return -1; + } + if (!is_prefix(*argv, "id")) { p_err("expected 'id' got %s", *argv); return -1; @@ -230,9 +238,6 @@ int do_pin_any(int argc, char **argv, int (*get_fd_by_id)(__u32)) } NEXT_ARG(); - if (argc != 1) - usage(); - fd = get_fd_by_id(id); if (fd < 0) { p_err("can't get prog by id (%u): %s", id, strerror(errno)); -- 2.17.1