linux-next: manual merge of the akpm tree with the security tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
include/linux/audit.h between commit e23eb920b0f3 ("audit: export
audit_log_task_info") from the security tree and commit "mm: use
mm->exe_file instead of first VM_EXECUTABLE vma->vm_file" from the akpm
tree.

I fixed it up (I hope - see below) and can carry the fix as necessary (no
action is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

diff --cc kernel/auditsc.c
index 37f52f2,31cf885..0000000
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@@ -1154,38 -1154,12 +1154,37 @@@ error_path
  
  EXPORT_SYMBOL(audit_log_task_context);
  
 -static void audit_log_task_info(struct audit_buffer *ab, struct task_struct 
*tsk)
 +void audit_log_task_info(struct audit_buffer *ab, struct task_struct *tsk)
  {
 +      const struct cred *cred;
        char name[sizeof(tsk->comm)];
        struct mm_struct *mm = tsk->mm;
-       struct vm_area_struct *vma;
 +      char *tty;
 +
 +      if (!ab)
 +              return;
  
        /* tsk == current */
 +      cred = current_cred();
 +
 +      spin_lock_irq(&tsk->sighand->siglock);
 +      if (tsk->signal && tsk->signal->tty && tsk->signal->tty->name)
 +              tty = tsk->signal->tty->name;
 +      else
 +              tty = "(none)";
 +      spin_unlock_irq(&tsk->sighand->siglock);
 +
 +
 +      audit_log_format(ab,
 +                       " ppid=%ld pid=%d auid=%u uid=%u gid=%u"
 +                       " euid=%u suid=%u fsuid=%u"
 +                       " egid=%u sgid=%u fsgid=%u ses=%u tty=%s",
 +                       sys_getppid(),
 +                       tsk->pid,
 +                       tsk->loginuid, cred->uid, cred->gid,
 +                       cred->euid, cred->suid, cred->fsuid,
 +                       cred->egid, cred->sgid, cred->fsgid,
 +                       tsk->sessionid, tty);
  
        get_task_comm(name, tsk);
        audit_log_format(ab, " comm=");

pgplTPikE2WEB.pgp
Description: PGP signature