diff options
| author | Eric Paris <eparis@redhat.com> | 2012-04-04 21:01:43 +0200 |
|---|---|---|
| committer | Eric Paris <eparis@redhat.com> | 2012-04-09 18:23:03 +0200 |
| commit | b466066f9b648ccb6aa1e174f0389b7433e460fd (patch) | |
| tree | beaec41a751db3ceeb55e4c428bb7e1fe995d880 | |
| parent | apparmor: move task from common_audit_data to apparmor_audit_data (diff) | |
| download | linux-b466066f9b648ccb6aa1e174f0389b7433e460fd.tar.xz linux-b466066f9b648ccb6aa1e174f0389b7433e460fd.zip | |
LSM: remove the task field from common_audit_data
There are no legitimate users. Always use current and get back some stack
space for the common_audit_data.
Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | include/linux/lsm_audit.h | 1 | ||||
| -rw-r--r-- | security/lsm_audit.c | 8 | ||||
| -rw-r--r-- | security/selinux/hooks.c | 1 |
3 files changed, 2 insertions, 8 deletions
diff --git a/include/linux/lsm_audit.h b/include/linux/lsm_audit.h index 9e1ebf5851b8..75368c1aac78 100644 --- a/include/linux/lsm_audit.h +++ b/include/linux/lsm_audit.h @@ -53,7 +53,6 @@ struct common_audit_data { #define LSM_AUDIT_DATA_KMOD 8 #define LSM_AUDIT_DATA_INODE 9 #define LSM_AUDIT_DATA_DENTRY 10 - struct task_struct *tsk; union { struct path path; struct dentry *dentry; diff --git a/security/lsm_audit.c b/security/lsm_audit.c index 90c129b0102f..e796d2517653 100644 --- a/security/lsm_audit.c +++ b/security/lsm_audit.c @@ -213,12 +213,8 @@ static void dump_common_audit_data(struct audit_buffer *ab, { struct task_struct *tsk = current; - if (a->tsk) - tsk = a->tsk; - if (tsk && tsk->pid) { - audit_log_format(ab, " pid=%d comm=", tsk->pid); - audit_log_untrustedstring(ab, tsk->comm); - } + audit_log_format(ab, " pid=%d comm=", tsk->pid); + audit_log_untrustedstring(ab, tsk->comm); switch (a->type) { case LSM_AUDIT_DATA_NONE: diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 9f0384493009..d79762946c6e 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -1429,7 +1429,6 @@ static int cred_has_capability(const struct cred *cred, COMMON_AUDIT_DATA_INIT(&ad, LSM_AUDIT_DATA_CAP); ad.selinux_audit_data = &sad; - ad.tsk = current; ad.u.cap = cap; switch (CAP_TO_INDEX(cap)) { |