mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-28 11:57:28 +00:00
7008be5bd7
in the future in a backward compatible (API and ABI) way.
The cap_rights_t represents capability rights. We used to use one bit to
represent one right, but we are running out of spare bits. Currently the new
structure provides place for 114 rights (so 50 more than the previous
cap_rights_t), but it is possible to grow the structure to hold at least 285
rights, although we can make it even larger if 285 rights won't be enough.
The structure definition looks like this:
struct cap_rights {
uint64_t cr_rights[CAP_RIGHTS_VERSION + 2];
};
The initial CAP_RIGHTS_VERSION is 0.
The top two bits in the first element of the cr_rights[] array contain total
number of elements in the array - 2. This means if those two bits are equal to
0, we have 2 array elements.
The top two bits in all remaining array elements should be 0.
The next five bits in all array elements contain array index. Only one bit is
used and bit position in this five-bits range defines array index. This means
there can be at most five array elements in the future.
To define new right the CAPRIGHT() macro must be used. The macro takes two
arguments - an array index and a bit to set, eg.
#define CAP_PDKILL CAPRIGHT(1, 0x0000000000000800ULL)
We still support aliases that combine few rights, but the rights have to belong
to the same array element, eg:
#define CAP_LOOKUP CAPRIGHT(0, 0x0000000000000400ULL)
#define CAP_FCHMOD CAPRIGHT(0, 0x0000000000002000ULL)
#define CAP_FCHMODAT (CAP_FCHMOD | CAP_LOOKUP)
There is new API to manage the new cap_rights_t structure:
cap_rights_t *cap_rights_init(cap_rights_t *rights, ...);
void cap_rights_set(cap_rights_t *rights, ...);
void cap_rights_clear(cap_rights_t *rights, ...);
bool cap_rights_is_set(const cap_rights_t *rights, ...);
bool cap_rights_is_valid(const cap_rights_t *rights);
void cap_rights_merge(cap_rights_t *dst, const cap_rights_t *src);
void cap_rights_remove(cap_rights_t *dst, const cap_rights_t *src);
bool cap_rights_contains(const cap_rights_t *big, const cap_rights_t *little);
Capability rights to the cap_rights_init(), cap_rights_set(),
cap_rights_clear() and cap_rights_is_set() functions are provided by
separating them with commas, eg:
cap_rights_t rights;
cap_rights_init(&rights, CAP_READ, CAP_WRITE, CAP_FSTAT);
There is no need to terminate the list of rights, as those functions are
actually macros that take care of the termination, eg:
#define cap_rights_set(rights, ...) \
__cap_rights_set((rights), __VA_ARGS__, 0ULL)
void __cap_rights_set(cap_rights_t *rights, ...);
Thanks to using one bit as an array index we can assert in those functions that
there are no two rights belonging to different array elements provided
together. For example this is illegal and will be detected, because CAP_LOOKUP
belongs to element 0 and CAP_PDKILL to element 1:
cap_rights_init(&rights, CAP_LOOKUP | CAP_PDKILL);
Providing several rights that belongs to the same array's element this way is
correct, but is not advised. It should only be used for aliases definition.
This commit also breaks compatibility with some existing Capsicum system calls,
but I see no other way to do that. This should be fine as Capsicum is still
experimental and this change is not going to 9.x.
Sponsored by: The FreeBSD Foundation
164 lines
4.9 KiB
Makefile
164 lines
4.9 KiB
Makefile
# @(#)Makefile 8.2 (Berkeley) 2/3/94
|
|
# $FreeBSD$
|
|
|
|
SHLIBDIR?= /lib
|
|
|
|
.include <bsd.own.mk>
|
|
|
|
# Pick the current architecture directory for libc. In general, this is
|
|
# named MACHINE_CPUARCH, but some ABIs are different enough to require
|
|
# their own libc, so allow a directory named MACHINE_ARCH to override this.
|
|
|
|
.if exists(${.CURDIR}/${MACHINE_ARCH})
|
|
LIBC_ARCH=${MACHINE_ARCH}
|
|
.else
|
|
LIBC_ARCH=${MACHINE_CPUARCH}
|
|
.endif
|
|
|
|
# All library objects contain FreeBSD revision strings by default; they may be
|
|
# excluded as a space-saving measure. To produce a library that does
|
|
# not contain these strings, add -DSTRIP_FBSDID (see <sys/cdefs.h>) to CFLAGS
|
|
# below. Note: there are no IDs for syscall stubs whose sources are generated.
|
|
# To include legacy CSRG sccsid strings, add -DLIBC_SCCS and -DSYSLIBC_SCCS
|
|
# to CFLAGS below. -DSYSLIBC_SCCS affects just the system call stubs.
|
|
LIB=c
|
|
SHLIB_MAJOR= 7
|
|
SHLIB_LDSCRIPT=libc.ldscript
|
|
WARNS?= 2
|
|
CFLAGS+=-I${.CURDIR}/include -I${.CURDIR}/../../include
|
|
CFLAGS+=-I${.CURDIR}/${LIBC_ARCH}
|
|
.if ${MK_NLS} != "no"
|
|
CFLAGS+=-DNLS
|
|
.endif
|
|
CLEANFILES+=tags
|
|
INSTALL_PIC_ARCHIVE=
|
|
PRECIOUSLIB=
|
|
|
|
.ifndef NO_THREAD_STACK_UNWIND
|
|
CANCELPOINTS_CFLAGS=-fexceptions
|
|
CFLAGS+=${CANCELPOINTS_CFLAGS}
|
|
.endif
|
|
|
|
#
|
|
# Only link with static libgcc.a (no libgcc_eh.a).
|
|
#
|
|
DPADD+= ${LIBGCC}
|
|
LDFLAGS+= -nodefaultlibs
|
|
LDADD+= -lgcc
|
|
|
|
.if ${MK_SSP} != "no"
|
|
LDADD+= -lssp_nonshared
|
|
.endif
|
|
|
|
# Define (empty) variables so that make doesn't give substitution
|
|
# errors if the included makefiles don't change these:
|
|
MDSRCS=
|
|
MISRCS=
|
|
MDASM=
|
|
MIASM=
|
|
NOASM=
|
|
|
|
.include "${.CURDIR}/${LIBC_ARCH}/Makefile.inc"
|
|
.include "${.CURDIR}/db/Makefile.inc"
|
|
.include "${.CURDIR}/compat-43/Makefile.inc"
|
|
.include "${.CURDIR}/gdtoa/Makefile.inc"
|
|
.include "${.CURDIR}/gen/Makefile.inc"
|
|
.include "${.CURDIR}/gmon/Makefile.inc"
|
|
.if ${MK_ICONV} != "no"
|
|
.include "${.CURDIR}/iconv/Makefile.inc"
|
|
.endif
|
|
.include "${.CURDIR}/inet/Makefile.inc"
|
|
.include "${.CURDIR}/isc/Makefile.inc"
|
|
.include "${.CURDIR}/locale/Makefile.inc"
|
|
.include "${.CURDIR}/nameser/Makefile.inc"
|
|
.include "${.CURDIR}/net/Makefile.inc"
|
|
.include "${.CURDIR}/nls/Makefile.inc"
|
|
.include "${.CURDIR}/posix1e/Makefile.inc"
|
|
.if ${LIBC_ARCH} != "amd64" && \
|
|
${LIBC_ARCH} != "ia64" && \
|
|
${LIBC_ARCH} != "powerpc64" && \
|
|
${LIBC_ARCH} != "sparc64" && \
|
|
${MACHINE_ARCH:Mmipsn32*} == "" && \
|
|
${MACHINE_ARCH:Mmips64*} == ""
|
|
.include "${.CURDIR}/quad/Makefile.inc"
|
|
.endif
|
|
.include "${.CURDIR}/regex/Makefile.inc"
|
|
.include "${.CURDIR}/resolv/Makefile.inc"
|
|
.include "${.CURDIR}/stdio/Makefile.inc"
|
|
.include "${.CURDIR}/stdlib/Makefile.inc"
|
|
.include "${.CURDIR}/stdlib/jemalloc/Makefile.inc"
|
|
.include "${.CURDIR}/stdtime/Makefile.inc"
|
|
.include "${.CURDIR}/string/Makefile.inc"
|
|
.include "${.CURDIR}/sys/Makefile.inc"
|
|
.include "${.CURDIR}/rpc/Makefile.inc"
|
|
.include "${.CURDIR}/uuid/Makefile.inc"
|
|
.include "${.CURDIR}/xdr/Makefile.inc"
|
|
.if ${LIBC_ARCH} == "arm" || ${LIBC_ARCH} == "mips"
|
|
.include "${.CURDIR}/softfloat/Makefile.inc"
|
|
.endif
|
|
.if ${MK_NIS} != "no"
|
|
CFLAGS+= -DYP
|
|
.include "${.CURDIR}/yp/Makefile.inc"
|
|
.endif
|
|
.include "${.CURDIR}/capability/Makefile.inc"
|
|
.if ${MK_HESIOD} != "no"
|
|
CFLAGS+= -DHESIOD
|
|
.endif
|
|
.if ${MK_FP_LIBC} == "no"
|
|
CFLAGS+= -DNO_FLOATING_POINT
|
|
.endif
|
|
.if ${MK_NS_CACHING} != "no"
|
|
CFLAGS+= -DNS_CACHING
|
|
.endif
|
|
.if defined(_FREEFALL_CONFIG)
|
|
CFLAGS+=-D_FREEFALL_CONFIG
|
|
.endif
|
|
|
|
VERSION_DEF=${.CURDIR}/Versions.def
|
|
SYMBOL_MAPS=${SYM_MAPS}
|
|
CFLAGS+= -DSYMBOL_VERSIONING
|
|
|
|
# If there are no machine dependent sources, append all the
|
|
# machine-independent sources:
|
|
.if empty(MDSRCS)
|
|
SRCS+= ${MISRCS}
|
|
.else
|
|
# Append machine-dependent sources, then append machine-independent sources
|
|
# for which there is no machine-dependent variant.
|
|
SRCS+= ${MDSRCS}
|
|
.for _src in ${MISRCS}
|
|
.if ${MDSRCS:R:M${_src:R}} == ""
|
|
SRCS+= ${_src}
|
|
.endif
|
|
.endfor
|
|
.endif
|
|
|
|
KQSRCS= adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c iordi3.c \
|
|
lshldi3.c lshrdi3.c moddi3.c muldi3.c negdi2.c notdi2.c qdivrem.c \
|
|
subdi3.c ucmpdi2.c udivdi3.c umoddi3.c xordi3.c
|
|
KSRCS= bcmp.c ffs.c ffsl.c fls.c flsl.c mcount.c strcat.c strchr.c \
|
|
strcmp.c strcpy.c strlen.c strncpy.c strrchr.c
|
|
|
|
libkern: libkern.gen libkern.${LIBC_ARCH}
|
|
|
|
libkern.gen: ${KQSRCS} ${KSRCS}
|
|
cp -p ${.CURDIR}/quad/quad.h ${.ALLSRC} ${DESTDIR}/sys/libkern
|
|
|
|
libkern.${LIBC_ARCH}:: ${KMSRCS}
|
|
.if defined(KMSRCS) && !empty(KMSRCS)
|
|
cp -p ${.ALLSRC} ${DESTDIR}/sys/libkern/${LIBC_ARCH}
|
|
.endif
|
|
|
|
.include <bsd.lib.mk>
|
|
|
|
# Disable warnings in contributed sources.
|
|
CWARNFLAGS:= ${.IMPSRC:Ngdtoa_*.c:C/^.+$/${CWARNFLAGS}/:C/^$/-w/}
|
|
# XXX For now, we don't allow libc to be compiled with
|
|
# -fstack-protector-all because it breaks rtld. We may want to make a librtld
|
|
# in the future to circumvent this.
|
|
SSP_CFLAGS:= ${SSP_CFLAGS:S/^-fstack-protector-all$/-fstack-protector/}
|
|
# Disable stack protection for SSP symbols.
|
|
SSP_CFLAGS:= ${.IMPSRC:N*/stack_protector.c:C/^.+$/${SSP_CFLAGS}/}
|
|
# Generate stack unwinding tables for cancellation points
|
|
CANCELPOINTS_CFLAGS:= ${.IMPSRC:Mcancelpoints_*:C/^.+$/${CANCELPOINTS_CFLAGS}/:C/^$//}
|