From nobody Thu Feb 06 15:38:50 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yph8q00fgz5mdCC; Thu, 06 Feb 2025 15:38:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yph8p6Y4Yz44Ng; Thu, 06 Feb 2025 15:38:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738856330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=An+2W7L8dpae08RfvrtbVickJ6a84bx/3ELD4/IGlV4=; b=XisH9QDNePapHleTw8s9s2Lrn2PIG471xkrUa98PBif5V+LFHttH7swbqYLd/Oq/5fNvZ4 w3wecngzGA283mhuoyd+H0N3LJM5UvoVlUouOUSOcoI6C6N0mze4EDeHz/kpbi7qd/tzSJ RBEoseAxocB6lTzFJvpbXxy+ICTEqT9TxtGn8LZlv3GdaZcEoM86+7Muu46oHXvxSDU2I3 d7+arYQNcd6L//KNACAjZGNBi5PdxHJEumBL5m58XnSFEXMpxs4Df3t8mcV37MY6WidxN6 ofP0tkDxnOp/rRBUkMOqETvHHydekVQiDSQDg0P40d02I1Kj1pfA58wqwddVqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738856330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=An+2W7L8dpae08RfvrtbVickJ6a84bx/3ELD4/IGlV4=; b=H1lW2ZdWeL7fcpZMJ0x2qmNR9szuzq0Q8z/NnK72qOuyNGw0mtje8fvDNYQMKu95gV2DvU lkch2aG2wWq5lZ4ZF+XfYurFmO58A8u6izYaM9Zv1vOjREsJIU59JNJdvKvZqjPZ6B/BSZ +RtDqyLtOjyBxZ4725BpyKUfNbS9jRvapFwBdI8YsO5+S8oQwTH++udVjnln9gAAC24UUz PCOk+mnQtCiwS1ya94nKVW8zOrbEzYBPSMvj1aNebFAzfbX4WHDMjnbonViNTiZ7slDXRs Jub5abTtKeebewiXY4MSgwVUmVhclioExiQ7dx+ZHyKWwu3D4wfnpIPeaoWR8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738856330; a=rsa-sha256; cv=none; b=L/dU5+K3fY95VTI2sQjcVK+/CPF2C0suLKkGoakurbaXUvOTm0CmVw83YoVfVLgZGpl2yx rGRaOJ5DhLFWEBekS6KM1DdLepIz1xTSh7ncd5lpIGXIuVEAmEXAzxJ6R3DbYi2PK4QDsJ Xmq8olQtE3uS1ncoF6qDTpl4K4YsG6DIf55fFkwwvxunf6DgdR8J3NovMm3MgDbOvDvsSz DHM8sD12Dd3EqlgaGs5FMlcPjd8UkDgHilUEt3/DdIuCFCbUpjRoks+8E0tnoTmmTd0CO1 pEt5Lrl5qlVtVfS4IHOCPPrIQE9Vvl9jFR05wBcG1YisuDQGnCUqRboQJtObKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yph8p68HwzlCm; Thu, 06 Feb 2025 15:38:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 516FcowM002352; Thu, 6 Feb 2025 15:38:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 516Fcom3002349; Thu, 6 Feb 2025 15:38:50 GMT (envelope-from git) Date: Thu, 6 Feb 2025 15:38:50 GMT Message-Id: <202502061538.516Fcom3002349@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 99bcb54d8d91 - stable/14 - ip6addrctl(8): Strictly check the number of arguments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 99bcb54d8d9138480001a262f080b7e8b0c24f58 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=99bcb54d8d9138480001a262f080b7e8b0c24f58 commit 99bcb54d8d9138480001a262f080b7e8b0c24f58 Author: Zhenlei Huang AuthorDate: 2025-01-29 10:00:07 +0000 Commit: Zhenlei Huang CommitDate: 2025-02-06 15:38:03 +0000 ip6addrctl(8): Strictly check the number of arguments The additional arguments are useless but may tempt user a wrong usage. Reviewed by: dfr MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48701 (cherry picked from commit 13ce55b66fad2b2b4054a89a1a906f58dc33683b) --- usr.sbin/ip6addrctl/ip6addrctl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/usr.sbin/ip6addrctl/ip6addrctl.c b/usr.sbin/ip6addrctl/ip6addrctl.c index 146b2f1ad3e0..dd5df48048aa 100644 --- a/usr.sbin/ip6addrctl/ip6addrctl.c +++ b/usr.sbin/ip6addrctl/ip6addrctl.c @@ -75,22 +75,24 @@ static void flush_policy(void); int main(int argc, char *argv[]) { - if (argc == 1 || strcasecmp(argv[1], "show") == 0) { + if (argc == 1 || (argc == 2 && strcasecmp(argv[1], "show") == 0)) { get_policy(); dump_policy(); } else if (strcasecmp(argv[1], "add") == 0) { - if (argc < 5) + if (argc != 5) usage(); add_policy(argv[2], argv[3], argv[4]); } else if (strcasecmp(argv[1], "delete") == 0) { - if (argc < 3) + if (argc != 3) usage(); delete_policy(argv[2]); } else if (strcasecmp(argv[1], "flush") == 0) { + if (argc != 2) + usage(); get_policy(); flush_policy(); } else if (strcasecmp(argv[1], "install") == 0) { - if (argc < 3) + if (argc != 3) usage(); configfile = argv[2]; make_policy_fromfile(configfile);