From nobody Wed Jan 29 10:01:00 2025 X-Original-To: dev-commits-src-all@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 4Yjd2h1yLBz5mTKB; Wed, 29 Jan 2025 10:01:00 +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 4Yjd2h1LqFz3vtq; Wed, 29 Jan 2025 10:01:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738144860; 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=IZ/SpQxZ8/t26ybumKPvufeOvVWkfnl+xx0Vw5HE7KE=; b=P1ggp5c3N1MzY5yHzGhuXRDyNWCApEedw7iUxTmVo/sIxxDWIRyzXFAz9BIhV53BQm/pms vfrtcNH8EsDgj4gX4ZYidLqM3oLO87FlJTSVFXZHdOTtWS/B6kkshXVffrOtRrPpyoNwK3 qoyrYW11JdiRunENlVFFqHtNJlUcbmpoLQm0zZBfRnyLkeJRczJRDz1aM7YiwLisXiEcY3 TWMtYTBzg4zVevljY6+Iwg6DOGj833A7qHX2uhUEIEMADcqvy03s+2m16Ofp7ZBN63FSSO DF37dibw9t9s5h9ImhTxiDjN9n1McfEFs9MVTuzDwG0QTftev03ltgCY6+NmxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738144860; 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=IZ/SpQxZ8/t26ybumKPvufeOvVWkfnl+xx0Vw5HE7KE=; b=grQllRKiORmDLxDdNzaIxy2MVQhqBEfrBVAMRXFwf/D6TNMi92V3jfg26HPTWVCx5Hmu/K xpwsFmO/bDHflfjtEtZUSoPP5OWT4ocz1h8yMlS0wVrAKftBovHqqvsCOtGBm53vxbzS/j 8Bf2E/gILonKrpsMc9KFCUXnN/vOKtP6wutDHxAjT59TY00qYOxO5qgsW41ry4ZPH+9PKq S5l0BjZHk5KHS8v/cS5XNCCsWtJ4VZ1NCo9++nGrSynqoK6tE56McexIU6nCZr1GVuq7dD j0EddOUKao0ZSLKo5mKUzlUlPoyisXOpdxlLfkYo+PmRWOMfME695uSYxeQ0pw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738144860; a=rsa-sha256; cv=none; b=wpgokdG/YfsydYQPPG+lFLjLbS2aH0MlmZFv6qLUKLDlGNU6vwrMgghV1+KuemuxU6z8WY X0LJkwjZ0se6k1cvcC/GCGpatOWkVyiWEVDLESoV/RQIQrcA/TLtNX1f6phCMVC9y7zsQX ez+sy8hMWtPxK10QRne5pb7M0cpeWEOCJhBKT/K7dfpUAANi6rVbsDE5wrAqJgMNzagKzs IZ2VAqcS882fAewZZ9QgZb8+wd8/POQhtjQARPV+rnVcHgHQgm9NYqiugICpWwT3jdG0gn nmCskdLwrP6P9ZwCKFW83LIO7xjJUjCbSa4V7PcwzXMWvgxCmjLhJ7U1klsvYQ== 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 4Yjd2h0yLMzwkn; Wed, 29 Jan 2025 10:01:00 +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 50TA10nx064242; Wed, 29 Jan 2025 10:01:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50TA10gh064239; Wed, 29 Jan 2025 10:01:00 GMT (envelope-from git) Date: Wed, 29 Jan 2025 10:01:00 GMT Message-Id: <202501291001.50TA10gh064239@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 13ce55b66fad - main - ip6addrctl(8): Strictly check the number of arguments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 13ce55b66fad2b2b4054a89a1a906f58dc33683b Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=13ce55b66fad2b2b4054a89a1a906f58dc33683b commit 13ce55b66fad2b2b4054a89a1a906f58dc33683b Author: Zhenlei Huang AuthorDate: 2025-01-29 10:00:07 +0000 Commit: Zhenlei Huang CommitDate: 2025-01-29 10:00:07 +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 --- 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);