History

capabilities: delete all CAP_INIT macros

The CAP_INIT macros of INH, BSET, and EFF made sense at one point in time, but now days they aren't helping. Just open code the logic in the init_cred.

Eric Paris committed 15 years ago

Commit a3232d21 parent 5163b583 files · +3 −13Browse files

Unified · Split

3 files
  1. include/linux/capability.h +0 −3
  2. include/linux/init_task.h +0 −7
  3. kernel/cred.c +3 −3
include/linux/capability.h+0−3
@@ -421,9 +421,6 @@ extern const kernel_cap_t __cap_init_eff_set; · 420 unmodified lines
421 421
422#endif /* _KERNEL_CAPABILITY_U32S != 2 */422#endif /* _KERNEL_CAPABILITY_U32S != 2 */
423 423
424#define CAP_INIT_INH_SET CAP_EMPTY_SET
425#define CAP_INIT_EFF_SET CAP_FULL_SET
426
427# define cap_clear(c) do { (c) = __cap_empty_set; } while (0)424# define cap_clear(c) do { (c) = __cap_empty_set; } while (0)
428 425
429#define cap_raise(c, flag) ((c).cap[CAP_TO_INDEX(flag)] |= CAP_TO_MASK(flag))426#define cap_raise(c, flag) ((c).cap[CAP_TO_INDEX(flag)] |= CAP_TO_MASK(flag))
include/linux/init_task.h+0−7
@@ -83,13 +83,6 @@ extern struct group_info init_groups; · 82 unmodified lines
83#define INIT_IDS83#define INIT_IDS
84#endif84#endif
85 85
86/*
87 * Because of the reduced scope of CAP_SETPCAP when filesystem
88 * capabilities are in effect, it is safe to allow CAP_SETPCAP to
89 * be available in the default configuration.
90 */
91# define CAP_INIT_BSET CAP_FULL_SET
92
93#ifdef CONFIG_RCU_BOOST86#ifdef CONFIG_RCU_BOOST
94#define INIT_TASK_RCU_BOOST() \87#define INIT_TASK_RCU_BOOST() \
95 .rcu_boost_mutex = NULL,88 .rcu_boost_mutex = NULL,
kernel/cred.c+3−3
@@ -49,10 +49,10 @@ struct cred init_cred = { · 48 unmodified lines
49 .magic = CRED_MAGIC,49 .magic = CRED_MAGIC,
50#endif50#endif
51 .securebits = SECUREBITS_DEFAULT,51 .securebits = SECUREBITS_DEFAULT,
52 .cap_inheritable = CAP_INIT_INH_SET,52 .cap_inheritable = CAP_EMPTY_SET,
53 .cap_permitted = CAP_FULL_SET,53 .cap_permitted = CAP_FULL_SET,
54 .cap_effective = CAP_INIT_EFF_SET,54 .cap_effective = CAP_FULL_SET,
55 .cap_bset = CAP_INIT_BSET,55 .cap_bset = CAP_FULL_SET,
56 .user = INIT_USER,56 .user = INIT_USER,
57 .group_info = &init_groups,57 .group_info = &init_groups,
58#ifdef CONFIG_KEYS58#ifdef CONFIG_KEYS