From nobody Thu Feb 06 16:09: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 4Yphrb1bSPz5mgGw; Thu, 06 Feb 2025 16:09: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 4Yphrb0GGBz4HZS; Thu, 06 Feb 2025 16:09:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738858191; 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=ajlp+ntA8N4/UUNY3osjHPh7x00Cd9G7nmsIMZ/V2oQ=; b=CwBB5GDu+PuMlVwVkQ0dTYRYonSonjgdMeSrZ0icDVcTYtH7ysgCw3HgQ5cc4g01rMyTOP FdciVFIbjE/PsvCE0em1YGvLOUnx8IUgnZ5MgWfwsAawc8YP1z2tKLRWM3xGO3G8a6NOBl UUkhFulUeCQ2ciFadnQUJV2e49tsvpdQQia+8eoC4LgJu1PYx/KJQtdW4aguC0+hgk5/++ AEYhRmi++3Qk5+2x27jQk7jAZOs42DmYySsrQX1PGx+FXAVuN2Wlc1CwLWiDWnkGIVRZ3T L0fN2kWFzIRM4m17V4ElhjqcnFrCv/vNbf6S3X0JVHPj2IOpwdlqwMyrNuvBMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738858191; 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=ajlp+ntA8N4/UUNY3osjHPh7x00Cd9G7nmsIMZ/V2oQ=; b=M/C1jZlAs/TXFDxPQV0aCwFfIibbqazM6Jrtuc4xAqxUYgjY2DOsjgHK6srj7ywkOyrg75 UC+Lpu8XxtBXLSIm+DYUbuQF+sz8DIAXAGeBNO0MnXpobhUh8z/56B7cxq7LCk1FWNlKxy KVycxWbexS1fZHTaDagzk+BYRGYcMArWLwLkhgPq9SP+5ycqzG/KfBQbMyuO3sj4ZrfqAs k46B1ppg9PDN4HNV9eiCExuzaAnIlpZIBP2yffGEOkKDM1QxrEHnBg1HDtSBFft9f2/5dU HTR/0i9GRbzKLqZEkBeU2aT3bJ33cFraQdvOHkyRxI4IA6xAVH/6vKaYU1z0kQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738858191; a=rsa-sha256; cv=none; b=veBeaKa+9WPJgAk7TSxeBoP1tI9Jg7UESyPhZzQEkthR1JmpGUOQ2Hk3U8M9cJwZndLK2v Ma2oBj2sseDD1xwvDcMjVnVczXExb+yGPdsJvS9V80Rq9XmWqCvW4QtwQyB4yvYq3TJCaI rOtwaRpUajCqd/cvmaApI/sVYpKe84qUhq2IPLvo+rO6xWeNkQjGLpJyyUOJVCyBu+JIj8 2Q0cZAM6YGoD9PmYDTzKSzPnUjXhMI6+yDeuMJsZrIlWh1uayqy0N0X43H0h/h9WEoXdzy BdwYmZvQnQq946Itoo4gwA7cz8m+EFag+xFURczSbw8OPaOSBOrixxyLh4nocA== 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 4YphrZ6cvqzlBf; Thu, 06 Feb 2025 16:09: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 516G9ohm059147; Thu, 6 Feb 2025 16:09:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 516G9oUP059144; Thu, 6 Feb 2025 16:09:50 GMT (envelope-from git) Date: Thu, 6 Feb 2025 16:09:50 GMT Message-Id: <202502061609.516G9oUP059144@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: fd2873861123 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: fd28738611234b5f65967d3f69235a107f64a726 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=fd28738611234b5f65967d3f69235a107f64a726 commit fd28738611234b5f65967d3f69235a107f64a726 Author: Zhenlei Huang AuthorDate: 2025-01-29 10:00:07 +0000 Commit: Zhenlei Huang CommitDate: 2025-02-06 16:08:52 +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) (cherry picked from commit 99bcb54d8d9138480001a262f080b7e8b0c24f58) --- 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 8cb4f05cc0a8..248d398964a0 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);