From nobody Thu Feb 06 16:09:51 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 4Yphrc1ybfz5mg85; Thu, 06 Feb 2025 16:09:52 +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 4Yphrb72g1z4HZT; 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=1738858192; 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=3UADnmrloCSH/kmbkJI13Fa4WZC4ngM/K3OdClPSXZs=; b=J27IxR2cF336s6KW/82dlrHJjG/PoDy+RlWwsMQRgZNDg19nEEAV9YOncZLMzuQrKSY4o4 Fe3D1LCmxUEp7oHqxmBHoHBc9uCakDFMzgERoq61tmQJyJgtp1tEUUK/K0Du69NSAJ678R yeeFTVZrAh1fkZF0qxXNWRGzA/8QBKtP0CH7hptgZoFpPVQgG1YoLmfI3CSYLPMZzm5efM lMcen4Tw0ZVgmJyvAPjMveYsFEVZbJx0nOqBShmE1eVO4oFXqzFTNAmz49PVcEbG6I5Z+n /rlNsF8O3lLUMf4zuxd5Y4znngxUmcZgv84zN7DjRgzvqVnjDUKjsrg81HVPpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738858192; 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=3UADnmrloCSH/kmbkJI13Fa4WZC4ngM/K3OdClPSXZs=; b=WS5Pg07Td996vp4IMRvyNPs9kWvS0dqPuK5ufeHKGp18QAMS7rkFneEQ64OjjtXTNASCYF cbk6qxSMFaG81+Z6k/9aft8UV/ZYXyeP3vaK364v6hyTZHgyvywtQGe5YD/8gW/Mtyo60i tZnZkEiqK/oxMT3NfFXlhhNAnWBfL/P41EkmVsiDNjbZdQv4NZ4uJNKPzG2h8pVBLPahEO rao4yftvSQpOdQs7wV0HAMey0HF7XBIZXDG9WIwwhMfqWW9SlDid/1ObcgELxlqsRClZAC fwA5FEfZFGrvKCT+wzB6VLn4a4y3tQq3M576dQtrn5U/bgj3KGC4I53SoB2V2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738858192; a=rsa-sha256; cv=none; b=Qb3YfIkearsqeY5p4LUmjz45yk7XGJi1mcqDR6Jzc6bkUjhx81mLw/Inc9PI1HrTHNKc9b HMICsI20Qq5BzZre7ujS8p9UygawX8bUlHbrBqlUpELcRCCu6nA2fmc6X616Dhjs1DqCL5 MRFs9n5z4XPFG95RSyzZjmUEWbvJHjEopQPwBQZitzHV4ZiTdfiP61YHvS9vOUMYo0Ukft w1H9mXeAUaDoIBqkVod03wsbc3Pt77uxHrGoyw+w769aKdzrGxaNkl5uHvs48YAgN0sbwc eZl/TGu4XMFuuLOlKrBrFFuUs2a1zoITajGy4KjRwob1BZm9CR1rSRQnUcp95A== 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 4Yphrb6WLVzlLh; Thu, 06 Feb 2025 16:09:51 +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 516G9puf059187; Thu, 6 Feb 2025 16:09:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 516G9poB059184; Thu, 6 Feb 2025 16:09:51 GMT (envelope-from git) Date: Thu, 6 Feb 2025 16:09:51 GMT Message-Id: <202502061609.516G9poB059184@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: fa9926a62ae3 - stable/13 - ip6addrctl(8): Teach ip6addrctl to attach and run itself in a jail 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: fa9926a62ae3ec9764b3c0e2a9856b78aa5fe780 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=fa9926a62ae3ec9764b3c0e2a9856b78aa5fe780 commit fa9926a62ae3ec9764b3c0e2a9856b78aa5fe780 Author: Zhenlei Huang AuthorDate: 2025-01-29 10:00:07 +0000 Commit: Zhenlei Huang CommitDate: 2025-02-06 16:08:52 +0000 ip6addrctl(8): Teach ip6addrctl to attach and run itself in a jail This will make it easier to manage address selection policies of vnet jails, especially for those light weighted OCI containers or slim jails. Requested by: dfr Reviewed by: dfr, markj MFC after: 1 week Relnotes: yes Differential Revision: https://reviews.freebsd.org/D48679 (cherry picked from commit 6dcdd79a251b5e62ff9ce562ad451e92dec39408) (cherry picked from commit b709f7b38cc4e99fa5cfef6613773a6848ed31c6) --- usr.sbin/ip6addrctl/Makefile | 6 +++ usr.sbin/ip6addrctl/ip6addrctl.8 | 12 +++++- usr.sbin/ip6addrctl/ip6addrctl.c | 85 ++++++++++++++++++++++++++++++++-------- 3 files changed, 85 insertions(+), 18 deletions(-) diff --git a/usr.sbin/ip6addrctl/Makefile b/usr.sbin/ip6addrctl/Makefile index 6fc277d39e63..356c524629d8 100644 --- a/usr.sbin/ip6addrctl/Makefile +++ b/usr.sbin/ip6addrctl/Makefile @@ -1,6 +1,12 @@ +.include PACKAGE= runtime PROG= ip6addrctl MAN= ip6addrctl.8 +.if ${MK_JAIL} != "no" +CFLAGS+= -DJAIL +LIBADD+= jail +.endif + .include diff --git a/usr.sbin/ip6addrctl/ip6addrctl.8 b/usr.sbin/ip6addrctl/ip6addrctl.8 index f50da59aa2bb..70e44a48e1c6 100644 --- a/usr.sbin/ip6addrctl/ip6addrctl.8 +++ b/usr.sbin/ip6addrctl/ip6addrctl.8 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 25, 2001 +.Dd January 29, 2025 .Dt IP6ADDRCTL 8 .Os .\" @@ -37,16 +37,21 @@ .\" .Sh SYNOPSIS .Nm +.Op Fl j Ar jail .Op Cm show .Nm +.Op Fl j Ar jail .Cm add .Ar prefix precedence label .Nm +.Op Fl j Ar jail .Cm delete .Ar prefix .Nm +.Op Fl j Ar jail .Cm flush .Nm +.Op Fl j Ar jail .Cm install .Ar configfile .\" @@ -62,6 +67,10 @@ is invoked without an argument or with a single argument it prints the content of the policy table currently installed in the kernel. .Pp +To operate inside a jail, the option +.Op Fl j Ar jail +should precede other options. +.Pp To modify the table, the following operations are available: .Bl -tag -width indent .It Cm add Ar prefix precedence label @@ -100,6 +109,7 @@ In the configuration file, lines beginning with the pound-sign .Pq Ql # are comments and are ignored. +Note that the configuration file will be processed before attaching to a jail. .El .\" .Sh EXIT STATUS diff --git a/usr.sbin/ip6addrctl/ip6addrctl.c b/usr.sbin/ip6addrctl/ip6addrctl.c index 248d398964a0..074af9dc2dbe 100644 --- a/usr.sbin/ip6addrctl/ip6addrctl.c +++ b/usr.sbin/ip6addrctl/ip6addrctl.c @@ -36,6 +36,9 @@ #include #include #include +#ifdef JAIL +#include +#endif #include #include @@ -45,12 +48,18 @@ #include #include +#ifdef JAIL +#include +#endif #include #include #include #include #include +#ifdef JAIL +static char *jailname; +#endif static char *configfile; struct policyqueue { @@ -61,6 +70,7 @@ TAILQ_HEAD(policyhead, policyqueue); static struct policyhead policyhead = TAILQ_HEAD_INITIALIZER(policyhead); static void usage(void); +static void attach_jail(void); static void get_policy(void); static void dump_policy(void); static int mask2plen(struct sockaddr_in6 *); @@ -75,27 +85,51 @@ static void flush_policy(void); int main(int argc, char *argv[]) { - if (argc == 1 || (argc == 2 && strcasecmp(argv[1], "show") == 0)) { + int ch; + + while ((ch = getopt(argc, argv, "j:")) != -1) { + switch (ch) { + case 'j': +#ifdef JAIL + if ((jailname = optarg) == NULL) + usage(); +#else + errx(1, "not built with jail support"); +#endif + break; + default: + usage(); + } + } + argc -= optind; + argv += optind; + + if (argc == 0 || (argc == 1 && strcasecmp(argv[0], "show") == 0)) { + attach_jail(); get_policy(); dump_policy(); - } else if (strcasecmp(argv[1], "add") == 0) { - if (argc != 5) + } else if (strcasecmp(argv[0], "add") == 0) { + if (argc != 4) usage(); - add_policy(argv[2], argv[3], argv[4]); - } else if (strcasecmp(argv[1], "delete") == 0) { - if (argc != 3) - usage(); - delete_policy(argv[2]); - } else if (strcasecmp(argv[1], "flush") == 0) { + attach_jail(); + add_policy(argv[1], argv[2], argv[3]); + } else if (strcasecmp(argv[0], "delete") == 0) { if (argc != 2) usage(); + attach_jail(); + delete_policy(argv[1]); + } else if (strcasecmp(argv[0], "flush") == 0) { + if (argc != 1) + usage(); + attach_jail(); get_policy(); flush_policy(); - } else if (strcasecmp(argv[1], "install") == 0) { - if (argc != 3) + } else if (strcasecmp(argv[0], "install") == 0) { + if (argc != 2) usage(); - configfile = argv[2]; + configfile = argv[1]; make_policy_fromfile(configfile); + attach_jail(); set_policy(); } else usage(); @@ -103,6 +137,23 @@ main(int argc, char *argv[]) exit(0); } +static void +attach_jail(void) +{ +#ifdef JAIL + int jid; + + if (jailname == NULL) + return; + + jid = jail_getid(jailname); + if (jid == -1) + errx(1, "jail not found"); + if (jail_attach(jid) != 0) + errx(1, "cannot attach to jail"); +#endif +} + static void get_policy(void) { @@ -445,12 +496,12 @@ flush_policy(void) static void usage(void) { - fprintf(stderr, "usage: ip6addrctl [show]\n"); - fprintf(stderr, " ip6addrctl add " + fprintf(stderr, "usage: ip6addrctl [-j jail] [show]\n"); + fprintf(stderr, " ip6addrctl [-j jail] add " "