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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AECB7C4332F for ; Mon, 14 Nov 2022 17:30:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237519AbiKNRaX (ORCPT ); Mon, 14 Nov 2022 12:30:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236635AbiKNRaU (ORCPT ); Mon, 14 Nov 2022 12:30:20 -0500 Received: from mail-pj1-x104a.google.com (mail-pj1-x104a.google.com [IPv6:2607:f8b0:4864:20::104a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BFD6922BD4 for ; Mon, 14 Nov 2022 09:30:19 -0800 (PST) Received: by mail-pj1-x104a.google.com with SMTP id nl16-20020a17090b385000b002138288fd51so10542778pjb.6 for ; Mon, 14 Nov 2022 09:30:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=d1dQp5WpI3a43ApVkLCwRzvLrzQKIAyYpZgXgD0Dw7Q=; b=EsBwEhpKorOzI+O/kMJ7e1ExFw2k7wXLa1cTMY0h2cFGy9eSyYckKZBEzMq/5z5cZ1 G9fHMgDPM+St0HiMUOAZaefO07g8e6411zpnoFMkgpAjQJgupPbE7SGCDbfye9K7c+jP NeqWOIml0melOuwdBK/7cLBTPho5FpGyKxA+8dWHxLpFTL08NB8bWNFrTR7I8K8jzwH8 3Q5EYeffUQHlFJNyl4b8LH4lGOZy6HwuxVDSJttl6CK7Ackx9xOJ6+zFZf1gkA2vngcj VAawUjbAtYA0J2Fgbjcz66EC/GHiIeAfvnC9NjJjRb4MrsQpZvTZOZY8StlsANSOkZeM mgKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=d1dQp5WpI3a43ApVkLCwRzvLrzQKIAyYpZgXgD0Dw7Q=; b=rG7BFaTt6WY/VyXvGbXAXiuuClbhXjS3LtQ4cvrUjlPyQIGDw//PjHcZ2mU4XHqHqa r1PAntztYNWlKayZO3h/Z5Yb0KLt6s1QHd9FRYk8WGFJnCJ3ImY5/cQ5r7eG/zpumzD3 fz12pal3DD7Hv/TvHg+hysfv4ej+cFegqYCL9VlMpEGcX6FKHE9bxAnEtUyybhqSs+P5 9FQpVer9i4OFqCNuzA9c6GJJfFX3u/KBSvhB73vy+4DiN3cuHkKETmDmKPbRWOWkeOq5 kMpD0tnyI1CAAedr1rb4AbIKpuaWjRBBakhiyUUSTh7v61HPzFMPzFxcoXtEcb5M6Ha7 i3YQ== X-Gm-Message-State: ANoB5plOiGiXrc6/Cer33RFVO1zkM/vFWIj/YRJ89Cls2dym/wW6ufIa yvGTKGIkl1N9EsqdevdhS13ewBc= X-Google-Smtp-Source: AA0mqf6kcXlwL6kSjatGPQziRYISFTgJut4/wY+lwR5YYWdiVqbud6lS/hlF2znlXiuvjK7Qvs3E7+8= X-Received: from sdf.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5935]) (user=sdf job=sendgmr) by 2002:aa7:96a2:0:b0:56b:f62c:4dc0 with SMTP id g2-20020aa796a2000000b0056bf62c4dc0mr14522852pfk.79.1668447019263; Mon, 14 Nov 2022 09:30:19 -0800 (PST) Date: Mon, 14 Nov 2022 09:30:17 -0800 In-Reply-To: <1668396484-4596-3-git-send-email-yangtiezhu@loongson.cn> Mime-Version: 1.0 References: <1668396484-4596-1-git-send-email-yangtiezhu@loongson.cn> <1668396484-4596-3-git-send-email-yangtiezhu@loongson.cn> Message-ID: Subject: Re: [PATCH bpf-next 2/2] bpftool: Check argc first before "file" in do_batch() From: sdf@google.com To: Tiezhu Yang Cc: Quentin Monnet , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , bpf@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8"; format=flowed; delsp=yes Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/14, Tiezhu Yang wrote: > If the parameters for batch are more than 2, check argc first can > return immediately, no need to use strcmp() to check "file" with > a little overhead and then check argc, it is better to check "file" > only when the parameters for batch are 2. Seems fine if you respin with is_prefix instead of strcmp. Has the potential of breaking some buggy users which pass more than one file, but I don't think it's a good justification no to do the fix? Quentin? > Signed-off-by: Tiezhu Yang > --- > tools/bpf/bpftool/main.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > diff --git a/tools/bpf/bpftool/main.c b/tools/bpf/bpftool/main.c > index 4ef87c2..27d6dbf 100644 > --- a/tools/bpf/bpftool/main.c > +++ b/tools/bpf/bpftool/main.c > @@ -337,12 +337,12 @@ static int do_batch(int argc, char **argv) > if (argc < 2) { > p_err("too few parameters for batch"); > return -1; > - } else if (strcmp(*argv, "file")) { > - p_err("expected 'file', got: %s", *argv); > - return -1; > } else if (argc > 2) { > p_err("too many parameters for batch"); > return -1; > + } else if (strcmp(*argv, "file")) { > + p_err("expected 'file', got: %s", *argv); > + return -1; > } > NEXT_ARG(); > -- > 2.1.0