413628a7e3
Bring in updated jail support from bz_jail branch. This enhances the current jail implementation to permit multiple addresses per jail. In addtion to IPv4, IPv6 is supported as well. Due to updated checks it is even possible to have jails without an IP address at all, which basically gives one a chroot with restricted process view, no networking,.. SCTP support was updated and supports IPv6 in jails as well. Cpuset support permits jails to be bound to specific processor sets after creation. Jails can have an unrestricted (no duplicate protection, etc.) name in addition to the hostname. The jail name cannot be changed from within a jail and is considered to be used for management purposes or as audit-token in the future. DDB 'show jails' command was added to aid debugging. Proper compat support permits 32bit jail binaries to be used on 64bit systems to manage jails. Also backward compatibility was preserved where possible: for jail v1 syscalls, as well as with user space management utilities. Both jail as well as prison version were updated for the new features. A gap was intentionally left as the intermediate versions had been used by various patches floating around the last years. Bump __FreeBSD_version for the afore mentioned and in kernel changes. Special thanks to: - Pawel Jakub Dawidek (pjd) for his multi-IPv4 patches and Olivier Houchard (cognet) for initial single-IPv6 patches. - Jeff Roberson (jeff) and Randall Stewart (rrs) for their help, ideas and review on cpuset and SCTP support. - Robert Watson (rwatson) for lots and lots of help, discussions, suggestions and review of most of the patch at various stages. - John Baldwin (jhb) for his help. - Simon L. Nielsen (simon) as early adopter testing changes on cluster machines as well as all the testers and people who provided feedback the last months on freebsd-jail and other channels. - My employer, CK Software GmbH, for the support so I could work on this. Reviewed by: (see above) MFC after: 3 months (this is just so that I get the mail) X-MFC Before: 7.2-RELEASE if possible
195 lines
4.6 KiB
C
195 lines
4.6 KiB
C
/*-
|
|
* Copyright (c) 2001 Doug Rabson
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#ifndef _COMPAT_FREEBSD32_FREEBSD32_H_
|
|
#define _COMPAT_FREEBSD32_FREEBSD32_H_
|
|
|
|
#define PTRIN(v) (void *)(uintptr_t) (v)
|
|
#define PTROUT(v) (u_int32_t)(uintptr_t) (v)
|
|
|
|
#define CP(src,dst,fld) do { (dst).fld = (src).fld; } while (0)
|
|
#define PTRIN_CP(src,dst,fld) \
|
|
do { (dst).fld = PTRIN((src).fld); } while (0)
|
|
#define PTROUT_CP(src,dst,fld) \
|
|
do { (dst).fld = PTROUT((src).fld); } while (0)
|
|
|
|
struct timeval32 {
|
|
int32_t tv_sec;
|
|
int32_t tv_usec;
|
|
};
|
|
#define TV_CP(src,dst,fld) do { \
|
|
CP((src).fld,(dst).fld,tv_sec); \
|
|
CP((src).fld,(dst).fld,tv_usec); \
|
|
} while (0)
|
|
|
|
struct timespec32 {
|
|
u_int32_t tv_sec;
|
|
u_int32_t tv_nsec;
|
|
};
|
|
#define TS_CP(src,dst,fld) do { \
|
|
CP((src).fld,(dst).fld,tv_sec); \
|
|
CP((src).fld,(dst).fld,tv_nsec); \
|
|
} while (0);
|
|
|
|
struct rusage32 {
|
|
struct timeval32 ru_utime;
|
|
struct timeval32 ru_stime;
|
|
int32_t ru_maxrss;
|
|
int32_t ru_ixrss;
|
|
int32_t ru_idrss;
|
|
int32_t ru_isrss;
|
|
int32_t ru_minflt;
|
|
int32_t ru_majflt;
|
|
int32_t ru_nswap;
|
|
int32_t ru_inblock;
|
|
int32_t ru_oublock;
|
|
int32_t ru_msgsnd;
|
|
int32_t ru_msgrcv;
|
|
int32_t ru_nsignals;
|
|
int32_t ru_nvcsw;
|
|
int32_t ru_nivcsw;
|
|
};
|
|
|
|
struct itimerval32 {
|
|
struct timeval32 it_interval;
|
|
struct timeval32 it_value;
|
|
};
|
|
|
|
#define FREEBSD4_MNAMELEN (88 - 2 * sizeof(int32_t)) /* size of on/from name bufs */
|
|
|
|
/* 4.x version */
|
|
struct statfs32 {
|
|
int32_t f_spare2;
|
|
int32_t f_bsize;
|
|
int32_t f_iosize;
|
|
int32_t f_blocks;
|
|
int32_t f_bfree;
|
|
int32_t f_bavail;
|
|
int32_t f_files;
|
|
int32_t f_ffree;
|
|
fsid_t f_fsid;
|
|
uid_t f_owner;
|
|
int32_t f_type;
|
|
int32_t f_flags;
|
|
int32_t f_syncwrites;
|
|
int32_t f_asyncwrites;
|
|
char f_fstypename[MFSNAMELEN];
|
|
char f_mntonname[FREEBSD4_MNAMELEN];
|
|
int32_t f_syncreads;
|
|
int32_t f_asyncreads;
|
|
int16_t f_spares1;
|
|
char f_mntfromname[FREEBSD4_MNAMELEN];
|
|
int16_t f_spares2 __packed;
|
|
int32_t f_spare[2];
|
|
};
|
|
|
|
struct kevent32 {
|
|
u_int32_t ident; /* identifier for this event */
|
|
short filter; /* filter for event */
|
|
u_short flags;
|
|
u_int fflags;
|
|
int32_t data;
|
|
u_int32_t udata; /* opaque user data identifier */
|
|
};
|
|
|
|
struct iovec32 {
|
|
u_int32_t iov_base;
|
|
int iov_len;
|
|
};
|
|
|
|
struct msghdr32 {
|
|
u_int32_t msg_name;
|
|
socklen_t msg_namelen;
|
|
u_int32_t msg_iov;
|
|
int msg_iovlen;
|
|
u_int32_t msg_control;
|
|
socklen_t msg_controllen;
|
|
int msg_flags;
|
|
};
|
|
|
|
struct stat32 {
|
|
dev_t st_dev;
|
|
ino_t st_ino;
|
|
mode_t st_mode;
|
|
nlink_t st_nlink;
|
|
uid_t st_uid;
|
|
gid_t st_gid;
|
|
dev_t st_rdev;
|
|
struct timespec32 st_atimespec;
|
|
struct timespec32 st_mtimespec;
|
|
struct timespec32 st_ctimespec;
|
|
off_t st_size;
|
|
int64_t st_blocks;
|
|
u_int32_t st_blksize;
|
|
u_int32_t st_flags;
|
|
u_int32_t st_gen;
|
|
struct timespec32 st_birthtimespec;
|
|
unsigned int :(8 / 2) * (16 - (int)sizeof(struct timespec32));
|
|
unsigned int :(8 / 2) * (16 - (int)sizeof(struct timespec32));
|
|
};
|
|
|
|
struct jail32_v0 {
|
|
u_int32_t version;
|
|
uint32_t path;
|
|
uint32_t hostname;
|
|
u_int32_t ip_number;
|
|
};
|
|
|
|
struct jail32 {
|
|
uint32_t version;
|
|
uint32_t path;
|
|
uint32_t hostname;
|
|
uint32_t jailname;
|
|
uint32_t ip4s;
|
|
uint32_t ip6s;
|
|
uint32_t ip4;
|
|
uint32_t ip6;
|
|
};
|
|
|
|
struct sigaction32 {
|
|
u_int32_t sa_u;
|
|
int sa_flags;
|
|
sigset_t sa_mask;
|
|
};
|
|
|
|
struct thr_param32 {
|
|
uint32_t start_func;
|
|
uint32_t arg;
|
|
uint32_t stack_base;
|
|
uint32_t stack_size;
|
|
uint32_t tls_base;
|
|
uint32_t tls_size;
|
|
uint32_t child_tid;
|
|
uint32_t parent_tid;
|
|
int32_t flags;
|
|
uint32_t rtp;
|
|
uint32_t spare[3];
|
|
};
|
|
|
|
#endif /* !_COMPAT_FREEBSD32_FREEBSD32_H_ */
|