2609222ab4
- Capability is no longer separate descriptor type. Now every descriptor has set of its own capability rights. - The cap_new(2) system call is left, but it is no longer documented and should not be used in new code. - The new syscall cap_rights_limit(2) should be used instead of cap_new(2), which limits capability rights of the given descriptor without creating a new one. - The cap_getrights(2) syscall is renamed to cap_rights_get(2). - If CAP_IOCTL capability right is present we can further reduce allowed ioctls list with the new cap_ioctls_limit(2) syscall. List of allowed ioctls can be retrived with cap_ioctls_get(2) syscall. - If CAP_FCNTL capability right is present we can further reduce fcntls that can be used with the new cap_fcntls_limit(2) syscall and retrive them with cap_fcntls_get(2). - To support ioctl and fcntl white-listing the filedesc structure was heavly modified. - The audit subsystem, kdump and procstat tools were updated to recognize new syscalls. - Capability rights were revised and eventhough I tried hard to provide backward API and ABI compatibility there are some incompatible changes that are described in detail below: CAP_CREATE old behaviour: - Allow for openat(2)+O_CREAT. - Allow for linkat(2). - Allow for symlinkat(2). CAP_CREATE new behaviour: - Allow for openat(2)+O_CREAT. Added CAP_LINKAT: - Allow for linkat(2). ABI: Reuses CAP_RMDIR bit. - Allow to be target for renameat(2). Added CAP_SYMLINKAT: - Allow for symlinkat(2). Removed CAP_DELETE. Old behaviour: - Allow for unlinkat(2) when removing non-directory object. - Allow to be source for renameat(2). Removed CAP_RMDIR. Old behaviour: - Allow for unlinkat(2) when removing directory. Added CAP_RENAMEAT: - Required for source directory for the renameat(2) syscall. Added CAP_UNLINKAT (effectively it replaces CAP_DELETE and CAP_RMDIR): - Allow for unlinkat(2) on any object. - Required if target of renameat(2) exists and will be removed by this call. Removed CAP_MAPEXEC. CAP_MMAP old behaviour: - Allow for mmap(2) with any combination of PROT_NONE, PROT_READ and PROT_WRITE. CAP_MMAP new behaviour: - Allow for mmap(2)+PROT_NONE. Added CAP_MMAP_R: - Allow for mmap(PROT_READ). Added CAP_MMAP_W: - Allow for mmap(PROT_WRITE). Added CAP_MMAP_X: - Allow for mmap(PROT_EXEC). Added CAP_MMAP_RW: - Allow for mmap(PROT_READ | PROT_WRITE). Added CAP_MMAP_RX: - Allow for mmap(PROT_READ | PROT_EXEC). Added CAP_MMAP_WX: - Allow for mmap(PROT_WRITE | PROT_EXEC). Added CAP_MMAP_RWX: - Allow for mmap(PROT_READ | PROT_WRITE | PROT_EXEC). Renamed CAP_MKDIR to CAP_MKDIRAT. Renamed CAP_MKFIFO to CAP_MKFIFOAT. Renamed CAP_MKNODE to CAP_MKNODEAT. CAP_READ old behaviour: - Allow pread(2). - Disallow read(2), readv(2) (if there is no CAP_SEEK). CAP_READ new behaviour: - Allow read(2), readv(2). - Disallow pread(2) (CAP_SEEK was also required). CAP_WRITE old behaviour: - Allow pwrite(2). - Disallow write(2), writev(2) (if there is no CAP_SEEK). CAP_WRITE new behaviour: - Allow write(2), writev(2). - Disallow pwrite(2) (CAP_SEEK was also required). Added convinient defines: #define CAP_PREAD (CAP_SEEK | CAP_READ) #define CAP_PWRITE (CAP_SEEK | CAP_WRITE) #define CAP_MMAP_R (CAP_MMAP | CAP_SEEK | CAP_READ) #define CAP_MMAP_W (CAP_MMAP | CAP_SEEK | CAP_WRITE) #define CAP_MMAP_X (CAP_MMAP | CAP_SEEK | 0x0000000000000008ULL) #define CAP_MMAP_RW (CAP_MMAP_R | CAP_MMAP_W) #define CAP_MMAP_RX (CAP_MMAP_R | CAP_MMAP_X) #define CAP_MMAP_WX (CAP_MMAP_W | CAP_MMAP_X) #define CAP_MMAP_RWX (CAP_MMAP_R | CAP_MMAP_W | CAP_MMAP_X) #define CAP_RECV CAP_READ #define CAP_SEND CAP_WRITE #define CAP_SOCK_CLIENT \ (CAP_CONNECT | CAP_GETPEERNAME | CAP_GETSOCKNAME | CAP_GETSOCKOPT | \ CAP_PEELOFF | CAP_RECV | CAP_SEND | CAP_SETSOCKOPT | CAP_SHUTDOWN) #define CAP_SOCK_SERVER \ (CAP_ACCEPT | CAP_BIND | CAP_GETPEERNAME | CAP_GETSOCKNAME | \ CAP_GETSOCKOPT | CAP_LISTEN | CAP_PEELOFF | CAP_RECV | CAP_SEND | \ CAP_SETSOCKOPT | CAP_SHUTDOWN) Added defines for backward API compatibility: #define CAP_MAPEXEC CAP_MMAP_X #define CAP_DELETE CAP_UNLINKAT #define CAP_MKDIR CAP_MKDIRAT #define CAP_RMDIR CAP_UNLINKAT #define CAP_MKFIFO CAP_MKFIFOAT #define CAP_MKNOD CAP_MKNODAT #define CAP_SOCK_ALL (CAP_SOCK_CLIENT | CAP_SOCK_SERVER) Sponsored by: The FreeBSD Foundation Reviewed by: Christoph Mallon <christoph.mallon@gmx.de> Many aspects discussed with: rwatson, benl, jonathan ABI compatibility discussed with: kib
118 lines
4.8 KiB
C
118 lines
4.8 KiB
C
/*-
|
|
* Copyright (c) 2009 Rick Macklem, University of Guelph
|
|
* 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$
|
|
*/
|
|
|
|
/*
|
|
* These macros handle nfsvattr fields. They look a bit silly here, but
|
|
* are quite different for the Darwin port.
|
|
*/
|
|
#define NFSVNO_ATTRINIT(n) (VATTR_NULL(&((n)->na_vattr)))
|
|
#define NFSVNO_SETATTRVAL(n, f, v) ((n)->na_##f = (v))
|
|
#define NFSVNO_SETACTIVE(n, f)
|
|
#define NFSVNO_UNSET(n, f) ((n)->na_##f = VNOVAL)
|
|
#define NFSVNO_NOTSETMODE(n) ((n)->na_mode == ((mode_t)VNOVAL))
|
|
#define NFSVNO_ISSETMODE(n) ((n)->na_mode != ((mode_t)VNOVAL))
|
|
#define NFSVNO_NOTSETUID(n) ((n)->na_uid == ((uid_t)VNOVAL))
|
|
#define NFSVNO_ISSETUID(n) ((n)->na_uid != ((uid_t)VNOVAL))
|
|
#define NFSVNO_NOTSETGID(n) ((n)->na_gid == ((gid_t)VNOVAL))
|
|
#define NFSVNO_ISSETGID(n) ((n)->na_gid != ((gid_t)VNOVAL))
|
|
#define NFSVNO_NOTSETSIZE(n) ((n)->na_size == VNOVAL)
|
|
#define NFSVNO_ISSETSIZE(n) ((n)->na_size != VNOVAL)
|
|
#define NFSVNO_NOTSETATIME(n) ((n)->na_atime.tv_sec == VNOVAL)
|
|
#define NFSVNO_ISSETATIME(n) ((n)->na_atime.tv_sec != VNOVAL)
|
|
#define NFSVNO_NOTSETMTIME(n) ((n)->na_mtime.tv_sec == VNOVAL)
|
|
#define NFSVNO_ISSETMTIME(n) ((n)->na_mtime.tv_sec != VNOVAL)
|
|
|
|
/*
|
|
* This structure acts as a "catch-all" for information that
|
|
* needs to be returned by nfsd_fhtovp().
|
|
*/
|
|
struct nfsexstuff {
|
|
int nes_exflag; /* export flags */
|
|
int nes_numsecflavor; /* # of security flavors */
|
|
int nes_secflavors[MAXSECFLAVORS]; /* and the flavors */
|
|
};
|
|
|
|
/*
|
|
* These are NO-OPS for BSD until Isilon upstreams EXITCODE support.
|
|
* EXITCODE is an in-memory ring buffer that holds the routines failing status.
|
|
* This is a valuable tool to use when debugging and analyzing issues.
|
|
* In addition to recording a routine's failing status, it offers
|
|
* logging of routines for call stack tracing.
|
|
* EXITCODE should be used only in routines that return a true errno value, as
|
|
* that value will be formatted to a displayable errno string. Routines that
|
|
* return regular int status that are not true errno should not set EXITCODE.
|
|
* If you want to log routine tracing, you can add EXITCODE(0) to any routine.
|
|
* NFS extended the EXITCODE with EXITCODE2 to record either the routine's
|
|
* exit errno status or the nd_repstat.
|
|
*/
|
|
#define NFSEXITCODE(error)
|
|
#define NFSEXITCODE2(error, nd)
|
|
|
|
#define NFSVNO_EXINIT(e) ((e)->nes_exflag = 0)
|
|
#define NFSVNO_EXPORTED(e) ((e)->nes_exflag & MNT_EXPORTED)
|
|
#define NFSVNO_EXRDONLY(e) ((e)->nes_exflag & MNT_EXRDONLY)
|
|
#define NFSVNO_EXPORTANON(e) ((e)->nes_exflag & MNT_EXPORTANON)
|
|
#define NFSVNO_EXSTRICTACCESS(e) ((e)->nes_exflag & MNT_EXSTRICTACCESS)
|
|
#define NFSVNO_EXV4ONLY(e) ((e)->nes_exflag & MNT_EXV4ONLY)
|
|
|
|
#define NFSVNO_SETEXRDONLY(e) ((e)->nes_exflag = (MNT_EXPORTED|MNT_EXRDONLY))
|
|
|
|
#define NFSVNO_CMPFH(f1, f2) \
|
|
((f1)->fh_fsid.val[0] == (f2)->fh_fsid.val[0] && \
|
|
(f1)->fh_fsid.val[1] == (f2)->fh_fsid.val[1] && \
|
|
bcmp(&(f1)->fh_fid, &(f2)->fh_fid, sizeof(struct fid)) == 0)
|
|
|
|
#define NFSLOCKHASH(f) \
|
|
(&nfslockhash[nfsrv_hashfh(f) % NFSLOCKHASHSIZE])
|
|
|
|
#define NFSFPVNODE(f) ((struct vnode *)((f)->f_data))
|
|
#define NFSFPCRED(f) ((f)->f_cred)
|
|
#define NFSFPFLAG(f) ((f)->f_flag)
|
|
|
|
#define NFSNAMEICNDSET(n, c, o, f) do { \
|
|
(n)->cn_cred = (c); \
|
|
(n)->cn_nameiop = (o); \
|
|
(n)->cn_flags = (f); \
|
|
} while (0)
|
|
|
|
/*
|
|
* A little bit of Darwin vfs kpi.
|
|
*/
|
|
#define vnode_mount(v) ((v)->v_mount)
|
|
#define vfs_statfs(m) (&((m)->mnt_stat))
|
|
|
|
#define NFSPATHLEN_T size_t
|
|
|
|
/*
|
|
* These are set to the minimum and maximum size of a server file
|
|
* handle.
|
|
*/
|
|
#define NFSRV_MINFH (sizeof (fhandle_t))
|
|
#define NFSRV_MAXFH (sizeof (fhandle_t))
|
|
|