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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 01ADBC04E84 for ; Thu, 16 May 2019 11:48:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C8A6420848 for ; Thu, 16 May 2019 11:48:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558007281; bh=R/QDBwdKgUBJQZtU6QtGTSezueRphWX7wY2JPUMjJC8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=psk6DrfSbVtTr6rJVdPmP0+13kcEecEbmOcir1O3GCG4IOx8YUfTbuyKymwdwYCXT Q458onNhC8O+V84L6WOKYDX4ujbf2nQ7VwMiLMRL2OkByDTodgrAxeIWqwkN3nthfe yMdg1yjPiBFoh3GSY9775rSkG5F0LgfcWGCeyNt0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727507AbfEPLkD (ORCPT ); Thu, 16 May 2019 07:40:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:48060 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727560AbfEPLkD (ORCPT ); Thu, 16 May 2019 07:40:03 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 25B7B20833; Thu, 16 May 2019 11:40:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558006802; bh=R/QDBwdKgUBJQZtU6QtGTSezueRphWX7wY2JPUMjJC8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gO9cr4ERg9Or9igC2llQzhdQF8XJbmDadM/iQJoeN0IBZPJ7+48ZOE4EN0K2MBKzL GLaa3b0DirJewJCa2KP8JcBE/UDg/Ojo5Q86nCFNdERnqLk8YOOlUmC0pPQyUAAXrc ktFwWQBYsUwLodmHOhS9hRKW5EfToDlHDoPFu4Og= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alban Crequy , Quentin Monnet , Song Liu , Jakub Kicinski , Daniel Borkmann , Alexei Starovoitov , Sasha Levin , netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH AUTOSEL 5.0 22/34] tools: bpftool: fix infinite loop in map create Date: Thu, 16 May 2019 07:39:19 -0400 Message-Id: <20190516113932.8348-22-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190516113932.8348-1-sashal@kernel.org> References: <20190516113932.8348-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org From: Alban Crequy [ 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