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=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,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 A1511C282DD for ; Thu, 23 May 2019 19:37:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6E2E82177E for ; Thu, 23 May 2019 19:37:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558640232; bh=hnyuKlwcGnhqMmJ0G7Kl+bjhhI1ODqP4u/lCpUileYo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oBbs92Oh7CATm7FQFDITZmwHX1QVUowqIO5fcfsgZoWFyxT+PbyhrQ2XNLK2d7KcZ 7f2nhEzG7ePmFJmsxypNYD/NtQ4Z+cApP8XtJC06A27VTPDVq9CKoBcAI+b/f/lNdU vGHEsExoL2813s/SMYZnQ8Se3oKv+KcaIGzQR5jk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390960AbfEWTYm (ORCPT ); Thu, 23 May 2019 15:24:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:35740 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390545AbfEWTYl (ORCPT ); Thu, 23 May 2019 15:24:41 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EBF722054F; Thu, 23 May 2019 19:24:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558639481; bh=hnyuKlwcGnhqMmJ0G7Kl+bjhhI1ODqP4u/lCpUileYo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=w43PHblHTvoOnz/84uDWJo7YuvUsy+kL2Zhjha1XRQJHNcvvC5KQTZe0tUkCmmVUH x8xTZ3lzOcYEzjXaVvO7d5oOfkBSDcbVy5TZutumaTaxDEUO6rrFvXbiJ+NXuTbD+3 JyfrFIR97e+om7xlPKWKNnnNxGZ9Cdn11ur3+Rh4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alban Crequy , Quentin Monnet , Song Liu , Jakub Kicinski , Daniel Borkmann , Alexei Starovoitov , Sasha Levin Subject: [PATCH 5.0 121/139] tools: bpftool: fix infinite loop in map create Date: Thu, 23 May 2019 21:06:49 +0200 Message-Id: <20190523181735.320430804@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190523181720.120897565@linuxfoundation.org> References: <20190523181720.120897565@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 8694d8c1f82cccec9380e0d3720b84eee315dfb7 ] "bpftool map create" has an infinite loop on "while (argc)". The error case is missing. Symptoms: when forgetting to type the keyword 'type' in front of 'hash': $ sudo bpftool map create /sys/fs/bpf/dir/foobar hash key 8 value 8 entries 128 (infinite loop, taking all the CPU) ^C After the patch: $ sudo bpftool map create /sys/fs/bpf/dir/foobar hash key 8 value 8 entries 128 Error: unknown arg hash Fixes: 0b592b5a01be ("tools: bpftool: add map create command") Signed-off-by: Alban Crequy Reviewed-by: Quentin Monnet Acked-by: Song Liu Reviewed-by: Jakub Kicinski Signed-off-by: Daniel Borkmann Signed-off-by: Alexei Starovoitov Signed-off-by: Sasha Levin --- tools/bpf/bpftool/map.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/bpf/bpftool/map.c b/tools/bpf/bpftool/map.c index 1ef1ee2280a28..227766d9f43b1 100644 --- a/tools/bpf/bpftool/map.c +++ b/tools/bpf/bpftool/map.c @@ -1111,6 +1111,9 @@ static int do_create(int argc, char **argv) return -1; } NEXT_ARG(); + } else { + p_err("unknown arg %s", *argv); + return -1; } } -- 2.20.1