From nobody Wed Aug 16 12:32:14 2023 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 4RQnZl2MRDz4qd23; Wed, 16 Aug 2023 12:32:15 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQnZl1VQsz4Tcm; Wed, 16 Aug 2023 12:32:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692189135; 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=I49I65jSVruZZAG9XuyCMaNgy5irzS4ogkDUkLI5Eu4=; b=wDsxz8y34r+Kc08MlQZWHlSIoLcB3T/hGiaMHiow6MR9rC5K9NWBwnVOEcaBGf8559wTvw Bv/h7uxCjlxeuHddQ93402jEg0FeoAqlKy0cTLulIUKaUCVUvdxJo0fY8MruW3QZsLDLHy eeY7kYEXqxAfydMvflh6RqDpIi4sKBglY7oPvo87NxgJXirI+nHMtAnCp9uZVJIA+owEGZ pMNYxExsiA5vEV6l5++vqnXpO1qVcfnhX1bKkuNWso8VBRFaiPML2YuVRPfRn/GZB5GwUF bkDqhsDE8jCjrNLARfMKHufq/HdHj5QqU0aHD8qYE1npHyYgFxs9wNw4YppxiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692189135; 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=I49I65jSVruZZAG9XuyCMaNgy5irzS4ogkDUkLI5Eu4=; b=wNdPadCauUk94lLHJhMS6B3P2gRfbnlrLDtwomGtd3fIafsBhMJFOiDeceEsiWCb4MvXR5 UoOxlx4I7Zrd0nWlbE82eGhlSiyXveu7kL7XZ+B1oVc8GYoRVslVwy4PLfn1Arl40uZdSN 1HCe3aXqmbwkvssXX3UrN1EbW8YLFDkR/6fxUwp4MnC+mAnIWIdXqu/tODqkMEzWZl3TOO euSrL9xEkclghCpTJxX2BkvP/zOycKBK5JBuz+5dFu5Zzt9GnGE0jJkXdgzeGTNIS6qtCp BSaWF4ao0+UxzzGP7ssPLRqHIeNnE2KKm+lpAuA1wZjgkqpl4TSjL+qEqaCpIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692189135; a=rsa-sha256; cv=none; b=mrD7sK19PV4k6cIGamQl4E6phVEc8MxamjIPGjlj+cH3XhELG2SOAkPVtFV3QBupFQRX1Q uGTZsGY9HM7dYPZfeqXybYaYQ0h7y83Wu2imeJwpqSwqim+6zUAhhu9ntwHVnBcV6R2l6k LN9oBafK3NeijU6neQlQcbIqrY2TVtNy1e7yHwyTCVslPGX5UIa++Y4/ddVWf+Sx8gdBkN PkzVyVBmqwSeEXDdWCURrlf2OLscJc1m5DKO/itfRxNZUKTWiPixr1XN1tU/VBjHhnAvJu BwS7w4psXoc8OSdJarQAIg6PFnEML/camSbdIi6cKEj50sAAg5mElNEG4eBc/g== 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 4RQnZl06Lczs4m; Wed, 16 Aug 2023 12:32:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GCWEU1023412; Wed, 16 Aug 2023 12:32:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GCWEsT023408; Wed, 16 Aug 2023 12:32:14 GMT (envelope-from git) Date: Wed, 16 Aug 2023 12:32:14 GMT Message-Id: <202308161232.37GCWEsT023408@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Rabson Subject: git: 07cbc2f943ff - stable/13 - route(8): teach route to attach to jails 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 07cbc2f943ff32bee33c4405903795d5545d57ea Auto-Submitted: auto-generated The branch stable/13 has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=07cbc2f943ff32bee33c4405903795d5545d57ea commit 07cbc2f943ff32bee33c4405903795d5545d57ea Author: Yan Ka, Chiu AuthorDate: 2023-06-13 06:05:17 +0000 Commit: Doug Rabson CommitDate: 2023-08-16 12:25:57 +0000 route(8): teach route to attach to jails Add -j flag to route(8) to allow route to perform actions in a Jail. Differential Revision: https://reviews.freebsd.org/D40377 MFC after: 2 weeks (cherry picked from commit ab4d1b73cbf8980dbe05cde7d822010042db8344) --- sbin/route/Makefile | 5 +++++ sbin/route/route.8 | 5 ++++- sbin/route/route.c | 36 ++++++++++++++++++++++++++++++++++-- 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/sbin/route/Makefile b/sbin/route/Makefile index e65030f805bb..2cecadd24a72 100644 --- a/sbin/route/Makefile +++ b/sbin/route/Makefile @@ -19,6 +19,11 @@ CFLAGS+= -DINET6 .endif CFLAGS+= -I. +.if ${MK_JAIL} != "no" && !defined(RESCUE) +CFLAGS+= -DJAIL +LIBADD+= jail +.endif + HAS_TESTS= SUBDIR.${MK_TESTS}+= tests diff --git a/sbin/route/route.8 b/sbin/route/route.8 index afcf55ab44c7..72c22bee23ed 100644 --- a/sbin/route/route.8 +++ b/sbin/route/route.8 @@ -28,7 +28,7 @@ .\" @(#)route.8 8.3 (Berkeley) 3/19/94 .\" $FreeBSD$ .\" -.Dd March 14, 2023 +.Dd June 13, 2023 .Dt ROUTE 8 .Os .Sh NAME @@ -36,6 +36,7 @@ .Nd manually manipulate the routing tables .Sh SYNOPSIS .Nm +.Op Fl j Ar jail .Op Fl dnqtv .Ar command .Oo @@ -91,6 +92,8 @@ Suppress all output from the and .Cm flush commands. +.It Fl j Ar jail +Run inside a jail. .El .Pp The diff --git a/sbin/route/route.c b/sbin/route/route.c index 5f33cecb1b20..e10d0b18ee40 100644 --- a/sbin/route/route.c +++ b/sbin/route/route.c @@ -48,6 +48,9 @@ __FBSDID("$FreeBSD$"); #include #include #include +#ifdef JAIL +#include +#endif #include #include #include @@ -63,6 +66,9 @@ __FBSDID("$FreeBSD$"); #include #include #include +#ifdef JAIL +#include +#endif #include #include #include @@ -90,6 +96,9 @@ static struct keytab { {0, 0} }; +#ifdef JAIL +char * jail_name; +#endif static struct sockaddr_storage so[RTAX_MAX]; static int pid, rtm_addrs; static int s; @@ -161,7 +170,7 @@ usage(const char *cp) { if (cp != NULL) warnx("bad keyword: %s", cp); - errx(EX_USAGE, "usage: route [-46dnqtv] command [[modifiers] args]"); + errx(EX_USAGE, "usage: route [-j jail] [-46dnqtv] command [[modifiers] args]"); /* NOTREACHED */ } @@ -169,12 +178,15 @@ int main(int argc, char **argv) { int ch; +#ifdef JAIL + int jid; +#endif size_t len; if (argc < 2) usage(NULL); - while ((ch = getopt(argc, argv, "46nqdtv")) != -1) + while ((ch = getopt(argc, argv, "46nqdtvj:")) != -1) switch(ch) { case '4': #ifdef INET @@ -207,6 +219,15 @@ main(int argc, char **argv) case 'd': debugonly = 1; break; + case 'j': +#ifdef JAIL + if (optarg == NULL) + usage(NULL); + jail_name = optarg; +#else + errx(1, "Jail support is not compiled in"); +#endif + break; case '?': default: usage(NULL); @@ -216,6 +237,17 @@ main(int argc, char **argv) pid = getpid(); uid = geteuid(); + +#ifdef JAIL + if (jail_name != NULL) { + jid = jail_getid(jail_name); + if (jid == -1) + errx(1, "Jail not found"); + if (jail_attach(jid) != 0) + errx(1, "Cannot attach to jail"); + } +#endif + if (tflag) s = open(_PATH_DEVNULL, O_WRONLY, 0); else