Commit 219f0817 authored by Stephen Smalley's avatar Stephen Smalley Committed by Linus Torvalds

[PATCH] SELinux: fix deadlock on dcache lock

This fixes a deadlock on the dcache lock detected during testing at IBM
by moving the logging of the current executable information from the
SELinux avc_audit function to audit_log_exit (via an audit_log_task_info
helper) for processing upon syscall exit. 

For consistency, the patch also removes the logging of other
task-related information from avc_audit, deferring handling to
audit_log_exit instead. 

This allows simplification of the avc_audit code, allows the exe
information to be obtained more reliably, always includes the comm
information (useful for scripts), and avoids including bogus task
information for checks performed from irq or softirq. 
Signed-off-by: default avatarStephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: default avatarJames Morris <jmorris@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 865108d1
...@@ -610,6 +610,33 @@ static inline void audit_free_context(struct audit_context *context) ...@@ -610,6 +610,33 @@ static inline void audit_free_context(struct audit_context *context)
printk(KERN_ERR "audit: freed %d contexts\n", count); printk(KERN_ERR "audit: freed %d contexts\n", count);
} }
static void audit_log_task_info(struct audit_buffer *ab)
{
char name[sizeof(current->comm)];
struct mm_struct *mm = current->mm;
struct vm_area_struct *vma;
get_task_comm(name, current);
audit_log_format(ab, " comm=%s", name);
if (!mm)
return;
down_read(&mm->mmap_sem);
vma = mm->mmap;
while (vma) {
if ((vma->vm_flags & VM_EXECUTABLE) &&
vma->vm_file) {
audit_log_d_path(ab, "exe=",
vma->vm_file->f_dentry,
vma->vm_file->f_vfsmnt);
break;
}
vma = vma->vm_next;
}
up_read(&mm->mmap_sem);
}
static void audit_log_exit(struct audit_context *context) static void audit_log_exit(struct audit_context *context)
{ {
int i; int i;
...@@ -639,6 +666,7 @@ static void audit_log_exit(struct audit_context *context) ...@@ -639,6 +666,7 @@ static void audit_log_exit(struct audit_context *context)
context->gid, context->gid,
context->euid, context->suid, context->fsuid, context->euid, context->suid, context->fsuid,
context->egid, context->sgid, context->fsgid); context->egid, context->sgid, context->fsgid);
audit_log_task_info(ab);
audit_log_end(ab); audit_log_end(ab);
while (context->aux) { while (context->aux) {
struct audit_aux_data *aux; struct audit_aux_data *aux;
......
...@@ -532,7 +532,6 @@ void avc_audit(u32 ssid, u32 tsid, ...@@ -532,7 +532,6 @@ void avc_audit(u32 ssid, u32 tsid,
u16 tclass, u32 requested, u16 tclass, u32 requested,
struct av_decision *avd, int result, struct avc_audit_data *a) struct av_decision *avd, int result, struct avc_audit_data *a)
{ {
struct task_struct *tsk = current;
struct inode *inode = NULL; struct inode *inode = NULL;
u32 denied, audited; u32 denied, audited;
struct audit_buffer *ab; struct audit_buffer *ab;
...@@ -556,39 +555,6 @@ void avc_audit(u32 ssid, u32 tsid, ...@@ -556,39 +555,6 @@ void avc_audit(u32 ssid, u32 tsid,
audit_log_format(ab, "avc: %s ", denied ? "denied" : "granted"); audit_log_format(ab, "avc: %s ", denied ? "denied" : "granted");
avc_dump_av(ab, tclass,audited); avc_dump_av(ab, tclass,audited);
audit_log_format(ab, " for "); audit_log_format(ab, " for ");
if (a && a->tsk)
tsk = a->tsk;
if (tsk && tsk->pid) {
struct mm_struct *mm;
struct vm_area_struct *vma;
audit_log_format(ab, " pid=%d", tsk->pid);
if (tsk == current)
mm = current->mm;
else
mm = get_task_mm(tsk);
if (mm) {
if (down_read_trylock(&mm->mmap_sem)) {
vma = mm->mmap;
while (vma) {
if ((vma->vm_flags & VM_EXECUTABLE) &&
vma->vm_file) {
audit_log_d_path(ab, "exe=",
vma->vm_file->f_dentry,
vma->vm_file->f_vfsmnt);
break;
}
vma = vma->vm_next;
}
up_read(&mm->mmap_sem);
} else {
audit_log_format(ab, " comm=%s", tsk->comm);
}
if (tsk != current)
mmput(mm);
} else {
audit_log_format(ab, " comm=%s", tsk->comm);
}
}
if (a) { if (a) {
switch (a->type) { switch (a->type) {
case AVC_AUDIT_DATA_IPC: case AVC_AUDIT_DATA_IPC:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment