projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drm/rockchip: remove rga driver
[firefly-linux-kernel-4.4.55.git]
/
security
/
apparmor
/
capability.c
diff --git
a/security/apparmor/capability.c
b/security/apparmor/capability.c
index 84d1f5f538778b58f0b60c48d4a55ede44ff4c4f..1101c6f64bb7cb36602957ef2bcbc1538ee8aa63 100644
(file)
--- a/
security/apparmor/capability.c
+++ b/
security/apparmor/capability.c
@@
-53,8
+53,7
@@
static void audit_cb(struct audit_buffer *ab, void *va)
/**
* audit_caps - audit a capability
/**
* audit_caps - audit a capability
- * @profile: profile confining task (NOT NULL)
- * @task: task capability test was performed against (NOT NULL)
+ * @profile: profile being tested for confinement (NOT NULL)
* @cap: capability tested
* @error: error code returned by test
*
* @cap: capability tested
* @error: error code returned by test
*
@@
-63,8
+62,7
@@
static void audit_cb(struct audit_buffer *ab, void *va)
*
* Returns: 0 or sa->error on success, error code on failure
*/
*
* Returns: 0 or sa->error on success, error code on failure
*/
-static int audit_caps(struct aa_profile *profile, struct task_struct *task,
- int cap, int error)
+static int audit_caps(struct aa_profile *profile, int cap, int error)
{
struct audit_cache *ent;
int type = AUDIT_APPARMOR_AUTO;
{
struct audit_cache *ent;
int type = AUDIT_APPARMOR_AUTO;
@@
-73,7
+71,6
@@
static int audit_caps(struct aa_profile *profile, struct task_struct *task,
sa.type = LSM_AUDIT_DATA_CAP;
sa.aad = &aad;
sa.u.cap = cap;
sa.type = LSM_AUDIT_DATA_CAP;
sa.aad = &aad;
sa.u.cap = cap;
- sa.aad->tsk = task;
sa.aad->op = OP_CAPABLE;
sa.aad->error = error;
sa.aad->op = OP_CAPABLE;
sa.aad->error = error;
@@
-124,8
+121,7
@@
static int profile_capable(struct aa_profile *profile, int cap)
/**
* aa_capable - test permission to use capability
/**
* aa_capable - test permission to use capability
- * @task: task doing capability test against (NOT NULL)
- * @profile: profile confining @task (NOT NULL)
+ * @profile: profile being tested against (NOT NULL)
* @cap: capability to be tested
* @audit: whether an audit record should be generated
*
* @cap: capability to be tested
* @audit: whether an audit record should be generated
*
@@
-133,8
+129,7
@@
static int profile_capable(struct aa_profile *profile, int cap)
*
* Returns: 0 on success, or else an error code.
*/
*
* Returns: 0 on success, or else an error code.
*/
-int aa_capable(struct task_struct *task, struct aa_profile *profile, int cap,
- int audit)
+int aa_capable(struct aa_profile *profile, int cap, int audit)
{
int error = profile_capable(profile, cap);
{
int error = profile_capable(profile, cap);
@@
-144,5
+139,5
@@
int aa_capable(struct task_struct *task, struct aa_profile *profile, int cap,
return error;
}
return error;
}
- return audit_caps(profile,
task,
cap, error);
+ return audit_caps(profile, cap, error);
}
}