GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "CRED: Fix regression in cap_capable() as shown up by sys_faccessat() [ver #2]"

Browse source 
This reverts commit 14eaddc967.

David has a better version to come.
This commit is contained in:
James Morris 2009-01-07 09:21:54 +11:00
parent 76f7ba35d4
commit 29881c4502
9 changed files with 35 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

49
include/linux/security.h
View file

@ -48,9 +48,7 @@ struct audit_krule;
* These functions are in security/capability.c and are used
* as the default capabilities functions
*/
extern int cap_capable(int cap, int audit);
extern int cap_task_capable(struct task_struct *tsk, const struct cred *cred,
int cap, int audit);
extern int cap_capable(struct task_struct *tsk, int cap, int audit);
extern int cap_settime(struct timespec *ts, struct timezone *tz);
extern int cap_ptrace_may_access(struct task_struct *child, unsigned int mode);
extern int cap_ptrace_traceme(struct task_struct *parent);
@ -1197,18 +1195,9 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
* @permitted contains the permitted capability set.
* Return 0 and update @new if permission is granted.
* @capable:
* Check whether the current process has the @cap capability in its
* subjective/effective credentials.
* @cap contains the capability <include/linux/capability.h>.
* @audit: Whether to write an audit message or not
* Return 0 if the capability is granted for @tsk.
* @task_capable:
* Check whether the @tsk process has the @cap capability in its
* objective/real credentials.
* Check whether the @tsk process has the @cap capability.
* @tsk contains the task_struct for the process.
* @cred contains the credentials to use.
* @cap contains the capability <include/linux/capability.h>.
* @audit: Whether to write an audit message or not
* Return 0 if the capability is granted for @tsk.
* @acct:
* Check permission before enabling or disabling process accounting. If
@ -1301,9 +1290,7 @@ struct security_operations {
const kernel_cap_t *effective,
const kernel_cap_t *inheritable,
const kernel_cap_t *permitted);
int (*capable) (int cap, int audit);
int (*task_capable) (struct task_struct *tsk, const struct cred *cred,
int cap, int audit);
int (*capable) (struct task_struct *tsk, int cap, int audit);
int (*acct) (struct file *file);
int (*sysctl) (struct ctl_table *table, int op);
int (*quotactl) (int cmds, int type, int id, struct super_block *sb);
@ -1569,9 +1556,8 @@ 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_task_capable(struct task_struct *tsk, int cap);
int security_task_capable_noaudit(struct task_struct *tsk, int cap);
int security_capable(struct task_struct *tsk, int cap);
int security_capable_noaudit(struct task_struct *tsk, int cap);
int security_acct(struct file *file);
int security_sysctl(struct ctl_table *table, int op);
int security_quotactl(int cmds, int type, int id, struct super_block *sb);
@ -1768,31 +1754,14 @@ 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(struct task_struct *tsk, int cap)
{
return cap_capable(cap, SECURITY_CAP_AUDIT);
return cap_capable(tsk, cap, SECURITY_CAP_AUDIT);
}
static inline int security_task_capable(struct task_struct *tsk, int cap)
static inline int security_capable_noaudit(struct task_struct *tsk, int cap)
{
int ret;
rcu_read_lock();
ret = cap_task_capable(tsk, __task_cred(tsk), cap, SECURITY_CAP_AUDIT);
rcu_read_unlock();
return ret;
}
static inline
int security_task_capable_noaudit(struct task_struct *tsk, int cap)
{
int ret;
rcu_read_lock();
ret = cap_task_capable(tsk, __task_cred(tsk), cap,
SECURITY_CAP_NOAUDIT);
rcu_read_unlock();
return ret;
return cap_capable(tsk, cap, SECURITY_CAP_NOAUDIT);
}
static inline int security_acct(struct file *file)