5975c725df
Hi James, would you mind taking the following into security-testing? The securebits are used by passing them to prctl with the PR_{S,G}ET_SECUREBITS commands. But the defines must be shifted to be used in prctl, which begs to be confused and misused by userspace. So define some more convenient values for userspace to specify. This way userspace does prctl(PR_SET_SECUREBITS, SECBIT_NOROOT); instead of prctl(PR_SET_SECUREBITS, 1 << SECURE_NOROOT); (Thanks to Michael for the idea) This patch also adds include/linux/securebits to the installed headers. Then perhaps it can be included by glibc's sys/prctl.h. Changelog: Oct 29: Stephen Rothwell points out that issecure can be under __KERNEL__. Oct 14: (Suggestions by Michael Kerrisk): 1. spell out SETUID in SECBIT_NO_SETUID* 2. SECBIT_X_LOCKED does not imply SECBIT_X 3. add definitions for keepcaps Oct 14: As suggested by Michael Kerrisk, don't use SB_* as that convention is already in use. Use SECBIT_ prefix instead. Signed-off-by: Serge E. Hallyn <serue@us.ibm.com> Acked-by: Andrew G. Morgan <morgan@kernel.org> Acked-by: Michael Kerrisk <mtk.manpages@gmail.com> Cc: Ulrich Drepper <drepper@redhat.com> Cc: James Morris <jmorris@namei.org> Signed-off-by: James Morris <jmorris@namei.org>
54 lines
2.3 KiB
C
54 lines
2.3 KiB
C
#ifndef _LINUX_SECUREBITS_H
|
|
#define _LINUX_SECUREBITS_H 1
|
|
|
|
/* Each securesetting is implemented using two bits. One bit specifies
|
|
whether the setting is on or off. The other bit specify whether the
|
|
setting is locked or not. A setting which is locked cannot be
|
|
changed from user-level. */
|
|
#define issecure_mask(X) (1 << (X))
|
|
#ifdef __KERNEL__
|
|
#define issecure(X) (issecure_mask(X) & current_cred_xxx(securebits))
|
|
#endif
|
|
|
|
#define SECUREBITS_DEFAULT 0x00000000
|
|
|
|
/* When set UID 0 has no special privileges. When unset, we support
|
|
inheritance of root-permissions and suid-root executable under
|
|
compatibility mode. We raise the effective and inheritable bitmasks
|
|
*of the executable file* if the effective uid of the new process is
|
|
0. If the real uid is 0, we raise the effective (legacy) bit of the
|
|
executable file. */
|
|
#define SECURE_NOROOT 0
|
|
#define SECURE_NOROOT_LOCKED 1 /* make bit-0 immutable */
|
|
|
|
#define SECBIT_NOROOT (issecure_mask(SECURE_NOROOT))
|
|
#define SECBIT_NOROOT_LOCKED (issecure_mask(SECURE_NOROOT_LOCKED))
|
|
|
|
/* When set, setuid to/from uid 0 does not trigger capability-"fixup".
|
|
When unset, to provide compatiblility with old programs relying on
|
|
set*uid to gain/lose privilege, transitions to/from uid 0 cause
|
|
capabilities to be gained/lost. */
|
|
#define SECURE_NO_SETUID_FIXUP 2
|
|
#define SECURE_NO_SETUID_FIXUP_LOCKED 3 /* make bit-2 immutable */
|
|
|
|
#define SECBIT_NO_SETUID_FIXUP (issecure_mask(SECURE_NO_SETUID_FIXUP))
|
|
#define SECBIT_NO_SETUID_FIXUP_LOCKED \
|
|
(issecure_mask(SECURE_NO_SETUID_FIXUP_LOCKED))
|
|
|
|
/* When set, a process can retain its capabilities even after
|
|
transitioning to a non-root user (the set-uid fixup suppressed by
|
|
bit 2). Bit-4 is cleared when a process calls exec(); setting both
|
|
bit 4 and 5 will create a barrier through exec that no exec()'d
|
|
child can use this feature again. */
|
|
#define SECURE_KEEP_CAPS 4
|
|
#define SECURE_KEEP_CAPS_LOCKED 5 /* make bit-4 immutable */
|
|
|
|
#define SECBIT_KEEP_CAPS (issecure_mask(SECURE_KEEP_CAPS))
|
|
#define SECBIT_KEEP_CAPS_LOCKED (issecure_mask(SECURE_KEEP_CAPS_LOCKED))
|
|
|
|
#define SECURE_ALL_BITS (issecure_mask(SECURE_NOROOT) | \
|
|
issecure_mask(SECURE_NO_SETUID_FIXUP) | \
|
|
issecure_mask(SECURE_KEEP_CAPS))
|
|
#define SECURE_ALL_LOCKS (SECURE_ALL_BITS << 1)
|
|
|
|
#endif /* !_LINUX_SECUREBITS_H */
|