Re: [PATCH 4.4 24/72] audit: add tty field to LOGIN event
From: Greg Kroah-Hartman
Date: Thu May 17 2018 - 03:59:27 EST
On Mon, May 14, 2018 at 05:18:56PM +0100, Ben Hutchings wrote:
> On Fri, 2018-04-06 at 15:23 +0200, Greg Kroah-Hartman wrote:
> > 4.4-stable review patch. If anyone has any objections, please let me know.
> >
> > ------------------
> >
> > From: Richard Guy Briggs <rgb@xxxxxxxxxx>
> >
> > commit db0a6fb5d97afe01fd9c47d37c6daa82d4d4001d upstream.
> [...]
> > --- a/kernel/auditsc.c
> > +++ b/kernel/auditsc.c
> > @@ -1976,6 +1976,7 @@ static void audit_log_set_loginuid(kuid_
> > {
> > struct audit_buffer *ab;
> > uid_t uid, oldloginuid, loginuid;
> > + struct tty_struct *tty;
> >
> > if (!audit_enabled)
> > return;
> > @@ -1983,14 +1984,17 @@ static void audit_log_set_loginuid(kuid_
> > uid = from_kuid(&init_user_ns, task_uid(current));
> > oldloginuid = from_kuid(&init_user_ns, koldloginuid);
> > loginuid = from_kuid(&init_user_ns, kloginuid),
> > + tty = audit_get_tty(current);
> >
> > ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_LOGIN);
> > if (!ab)
> > return;
>
> This error path leaks the tty ref. Fixed upstream by:
>
> commit 76a658c20efd541a62838d9ff68ce94170d7a549
> Author: Richard Guy Briggs <rgb@xxxxxxxxxx>
> Date: Tue Jun 28 12:06:58 2016 -0400
>
> audit: move calcs after alloc and check when logging set loginuid
Thanks, now queued up.
greg k-h