d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sockstat: Attach to jail if in new vnet

Browse Source 
Attach sockstat -j to the specified jail if the jail is in a new vnet.
Otherwise we do not see all sockets belonging to the jail.

Reviewed by:	jamie
Approved by:	mmacy (mentor)
MFC after:	1 week
Differential Revision:	https://reviews.freebsd.org/D24413
This commit is contained in:
Ryan Moeller 2020-04-26 20:55:11 +00:00
parent 6f6e2de005
commit f1cd4902bf
1 changed files with 51 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
usr.bin/sockstat/sockstat.c
View File

@ -32,10 +32,11 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/file.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/sysctl.h>
#include <sys/file.h>
#include <sys/jail.h>
#include <sys/user.h>
#include <sys/un.h>
@ -1218,7 +1219,8 @@ display(void)
}
}
static int set_default_protos(void)
static int
set_default_protos(void)
{
struct protoent *prot;
const char *pname;
@ -1237,6 +1239,38 @@ static int set_default_protos(void)
return (pindex);
}
/*
* Return the vnet property of the jail, or -1 on error.
*/
static int
jail_getvnet(int jid)
{
struct iovec jiov[6];
int vnet;
vnet = -1;
jiov[0].iov_base = __DECONST(char *, "jid");
jiov[0].iov_len = sizeof("jid");
jiov[1].iov_base = &jid;
jiov[1].iov_len = sizeof(jid);
jiov[2].iov_base = __DECONST(char *, "vnet");
jiov[2].iov_len = sizeof("vnet");
jiov[3].iov_base = &vnet;
jiov[3].iov_len = sizeof(vnet);
jiov[4].iov_base = __DECONST(char *, "errmsg");
jiov[4].iov_len = sizeof("errmsg");
jiov[5].iov_base = jail_errmsg;
jiov[5].iov_len = JAIL_ERRMSGLEN;
jail_errmsg[0] = '\0';
if (jail_get(jiov, nitems(jiov), 0) < 0) {
if (!jail_errmsg[0])
snprintf(jail_errmsg, JAIL_ERRMSGLEN,
"jail_get: %s", strerror(errno));
return (-1);
}
return (vnet);
}
static void
usage(void)
{
@ -1311,6 +1345,21 @@ main(int argc, char *argv[])
if (argc > 0)
usage();
if (opt_j > 0) {
switch (jail_getvnet(opt_j)) {
case -1:
errx(2, "%s", jail_errmsg);
case JAIL_SYS_NEW:
if (jail_attach(opt_j) < 0)
errx(3, "%s", jail_errmsg);
/* Set back to -1 for normal output in vnet jail. */
opt_j = -1;
break;
default:
break;
}
}
if ((!opt_4 && !opt_6) && protos_defined != -1)
opt_4 = opt_6 = 1;
if (!opt_4 && !opt_6 && !opt_u)