Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3232d2f authored by Eric Paris's avatar Eric Paris Committed by James Morris
Browse files

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.

Signed-off-by: default avatarEric Paris <eparis@redhat.com>
Acked-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 5163b583

include/linux/capability.h

+0 −3
Original line number Diff line number Diff line
@@ -421,9 +421,6 @@ extern const kernel_cap_t __cap_init_eff_set; 


#endif /* _KERNEL_CAPABILITY_U32S != 2 */



#define CAP_INIT_INH_SET    CAP_EMPTY_SET

#define CAP_INIT_EFF_SET    CAP_FULL_SET



# define cap_clear(c)         do { (c) = __cap_empty_set; } while (0)



#define cap_raise(c, flag)  ((c).cap[CAP_TO_INDEX(flag)] |= CAP_TO_MASK(flag))

include/linux/init_task.h

+0 −7
Original line number Diff line number Diff line
@@ -83,13 +83,6 @@ extern struct group_info init_groups; 
#define INIT_IDS

#endif



/*

 * Because of the reduced scope of CAP_SETPCAP when filesystem

 * capabilities are in effect, it is safe to allow CAP_SETPCAP to

 * be available in the default configuration.

 */

# define CAP_INIT_BSET  CAP_FULL_SET



#ifdef CONFIG_RCU_BOOST

#define INIT_TASK_RCU_BOOST()						\

	.rcu_boost_mutex = NULL,

kernel/cred.c

+3 −3
Original line number Diff line number Diff line
@@ -49,10 +49,10 @@ struct cred init_cred = { 
	.magic			= CRED_MAGIC,

#endif

	.securebits		= SECUREBITS_DEFAULT,

	.cap_inheritable	= CAP_INIT_INH_SET,

	.cap_inheritable	= CAP_EMPTY_SET,

	.cap_permitted		= CAP_FULL_SET,

	.cap_effective		= CAP_INIT_EFF_SET,

	.cap_bset		= CAP_INIT_BSET,

	.cap_effective		= CAP_FULL_SET,

	.cap_bset		= CAP_FULL_SET,

	.user			= INIT_USER,

	.group_info		= &init_groups,

#ifdef CONFIG_KEYS