lkml.org 
[lkml]   [2012]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the userns tree with the security tree
Hi,

On Mon, 24 Sep 2012 21:41:16 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> diff --cc kernel/auditsc.c
> index 37f52f2,ff4798f..0000000
> --- a/kernel/auditsc.c
> +++ b/kernel/auditsc.c
> @@@ -1160,32 -1151,8 +1152,38 @@@ void audit_log_task_info(struct audit_b
> 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,
> ++ from_kuid(&init_user_ns, tsk->loginuid),
> ++ from_kuid(&init_user_ns, context->uid),
> ++ from_kgid(&init_user_ns, context->gid),
> ++ from_kuid(&init_user_ns, context->euid),
> ++ from_kuid(&init_user_ns, context->suid),
> ++ from_kuid(&init_user_ns, context->fsuid),
> ++ from_kgid(&init_user_ns, context->egid),
> ++ from_kgid(&init_user_ns, context->sgid),
> ++ from_kgid(&init_user_ns, context->fsgid),

These should all be "cred" not "context", of course. I fixed this in my
tree.

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-09-24 15:01    [W:0.049 / U:0.324 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site