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

Commit 6037b715 authored by Chris Wright's avatar Chris Wright Committed by James Morris
Browse files

security: add cred argument to security_capable() 



Expand security_capable() to include cred, so that it can be usable in a
wider range of call sites.

Signed-off-by: default avatarChris Wright <chrisw@sous-sol.org>
Acked-by: default avatarSerge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent deabb19b

include/linux/security.h

+3 −3
Original line number Diff line number Diff line
@@ -1662,7 +1662,7 @@ int security_capset(struct cred *new, const struct cred *old, 
		    const kernel_cap_t *effective,

		    const kernel_cap_t *inheritable,

		    const kernel_cap_t *permitted);

int security_capable(int cap);

int security_capable(const struct cred *cred, int cap);

int security_real_capable(struct task_struct *tsk, int cap);

int security_real_capable_noaudit(struct task_struct *tsk, int cap);

int security_sysctl(struct ctl_table *table, int op);
@@ -1856,9 +1856,9 @@ static inline int security_capset(struct cred *new, 
	return cap_capset(new, old, effective, inheritable, permitted);

}



static inline int security_capable(int cap)

static inline int security_capable(const struct cred *cred, int cap)

{

	return cap_capable(current, current_cred(), cap, SECURITY_CAP_AUDIT);

	return cap_capable(current, cred, cap, SECURITY_CAP_AUDIT);

}



static inline int security_real_capable(struct task_struct *tsk, int cap)

kernel/capability.c

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ int capable(int cap) 
		BUG();

	}



	if (security_capable(cap) == 0) {

	if (security_capable(current_cred(), cap) == 0) {

		current->flags |= PF_SUPERPRIV;

		return 1;

	}

security/security.c

+2 −3
Original line number Diff line number Diff line
@@ -154,10 +154,9 @@ int security_capset(struct cred *new, const struct cred *old, 
				    effective, inheritable, permitted);

}



int security_capable(int cap)

int security_capable(const struct cred *cred, int cap)

{

	return security_ops->capable(current, current_cred(), cap,

				     SECURITY_CAP_AUDIT);

	return security_ops->capable(current, cred, cap, SECURITY_CAP_AUDIT);

}



int security_real_capable(struct task_struct *tsk, int cap)