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

Commit 3263245d authored by Serge E. Hallyn's avatar Serge E. Hallyn Committed by Linus Torvalds
Browse files

userns: make has_capability* into real functions 



So we can let type safety keep things sane, and as a bonus we can remove
the declaration of init_user_ns in capability.h.

Signed-off-by: default avatarSerge E. Hallyn <serge.hallyn@canonical.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Daniel Lezcano <daniel.lezcano@free.fr>
Cc: David Howells <dhowells@redhat.com>
Cc: James Morris <jmorris@namei.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8409cca7

include/linux/capability.h

+4 −30
Original line number Original line Diff line number Diff line
@@ -371,8 +371,6 @@ struct cpu_vfs_cap_data { 
struct dentry;

struct dentry;

struct user_namespace;

struct user_namespace;





extern struct user_namespace init_user_ns;



struct user_namespace *current_user_ns(void);

struct user_namespace *current_user_ns(void);





extern const kernel_cap_t __cap_empty_set;

extern const kernel_cap_t __cap_empty_set;
@@ -541,34 +539,10 @@ static inline kernel_cap_t cap_raise_nfsd_set(const kernel_cap_t a, 
			   cap_intersect(permitted, __cap_nfsd_set));

			   cap_intersect(permitted, __cap_nfsd_set));

}

}





/**

extern bool has_capability(struct task_struct *t, int cap);

 * has_capability - Determine if a task has a superior capability available

extern bool has_ns_capability(struct task_struct *t,

 * @t: The task in question

			      struct user_namespace *ns, int cap);

 * @cap: The capability to be tested for

extern bool has_capability_noaudit(struct task_struct *t, int cap);

 *

 * Return true if the specified task has the given superior capability

 * currently in effect, false if not.

 *

 * Note that this does not set PF_SUPERPRIV on the task.

 */

#define has_capability(t, cap) (security_real_capable((t), &init_user_ns, (cap)) == 0)



#define has_ns_capability(t, ns, cap) (security_real_capable((t), (ns), (cap)) == 0)



/**

 * has_capability_noaudit - Determine if a task has a superior capability available (unaudited)

 * @t: The task in question

 * @cap: The capability to be tested for

 *

 * Return true if the specified task has the given superior capability

 * currently in effect, false if not, but don't write an audit message for the

 * check.

 *

 * Note that this does not set PF_SUPERPRIV on the task.

 */

#define has_capability_noaudit(t, cap) \

	(security_real_capable_noaudit((t), &init_user_ns, (cap)) == 0)



extern bool capable(int cap);

extern bool capable(int cap);

extern bool ns_capable(struct user_namespace *ns, int cap);

extern bool ns_capable(struct user_namespace *ns, int cap);

extern bool task_ns_capable(struct task_struct *t, int cap);

extern bool task_ns_capable(struct task_struct *t, int cap);

kernel/capability.c

+54 −0
Original line number Original line Diff line number Diff line
@@ -290,6 +290,60 @@ SYSCALL_DEFINE2(capset, cap_user_header_t, header, const cap_user_data_t, data) 
	return ret;

	return ret;

}

}





/**

 * has_capability - Does a task have a capability in init_user_ns

 * @t: The task in question

 * @cap: The capability to be tested for

 *

 * Return true if the specified task has the given superior capability

 * currently in effect to the initial user namespace, false if not.

 *

 * Note that this does not set PF_SUPERPRIV on the task.

 */

bool has_capability(struct task_struct *t, int cap)

{

	int ret = security_real_capable(t, &init_user_ns, cap);



	return (ret == 0);

}



/**

 * has_capability - Does a task have a capability in a specific user ns

 * @t: The task in question

 * @ns: target user namespace

 * @cap: The capability to be tested for

 *

 * Return true if the specified task has the given superior capability

 * currently in effect to the specified user namespace, false if not.

 *

 * Note that this does not set PF_SUPERPRIV on the task.

 */

bool has_ns_capability(struct task_struct *t,

		       struct user_namespace *ns, int cap)

{

	int ret = security_real_capable(t, ns, cap);



	return (ret == 0);

}



/**

 * has_capability_noaudit - Does a task have a capability (unaudited)

 * @t: The task in question

 * @cap: The capability to be tested for

 *

 * Return true if the specified task has the given superior capability

 * currently in effect to init_user_ns, false if not.  Don't write an

 * audit message for the check.

 *

 * Note that this does not set PF_SUPERPRIV on the task.

 */

bool has_capability_noaudit(struct task_struct *t, int cap)

{

	int ret = security_real_capable_noaudit(t, &init_user_ns, cap);



	return (ret == 0);

}



/**

/**

 * capable - Determine if the current task has a superior capability in effect

 * capable - Determine if the current task has a superior capability in effect

 * @cap: The capability to be tested for

 * @cap: The capability to be tested for