diff for duplicates of <20180517085602.GC25318@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 10f5159..730abc7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,6 +1,6 @@ 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. +> > 4.4-stable review patch.��If anyone has any objections, please let me know. > > > > ------------------ > > @@ -11,22 +11,22 @@ On Mon, May 14, 2018 at 05:18:56PM +0100, Ben Hutchings wrote: > > --- 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 audit_buffer *ab; +> > � uid_t uid, oldloginuid, loginuid; > > + struct tty_struct *tty; -> > -> > if (!audit_enabled) -> > return; +> > � +> > � 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), +> > � 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; +> > � +> > � ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_LOGIN); +> > � if (!ab) +> > � return; > > This error path leaks the tty ref. Fixed upstream by: > diff --git a/a/content_digest b/N1/content_digest index c113efe..b403f1e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -13,7 +13,7 @@ "b\0" "On Mon, May 14, 2018 at 05:18:56PM +0100, Ben Hutchings wrote:\n" "> On Fri, 2018-04-06 at 15:23 +0200, Greg Kroah-Hartman wrote:\n" - "> > 4.4-stable review patch.\302\240\302\240If anyone has any objections, please let me know.\n" + "> > 4.4-stable review patch.\303\257\302\277\302\275\303\257\302\277\302\275If anyone has any objections, please let me know.\n" "> > \n" "> > ------------------\n" "> > \n" @@ -24,22 +24,22 @@ "> > --- a/kernel/auditsc.c\n" "> > +++ b/kernel/auditsc.c\n" "> > @@ -1976,6 +1976,7 @@ static void audit_log_set_loginuid(kuid_\n" - "> > \302\240{\n" - "> > \302\240\tstruct audit_buffer *ab;\n" - "> > \302\240\tuid_t uid, oldloginuid, loginuid;\n" + "> > \303\257\302\277\302\275{\n" + "> > \303\257\302\277\302\275\tstruct audit_buffer *ab;\n" + "> > \303\257\302\277\302\275\tuid_t uid, oldloginuid, loginuid;\n" "> > +\tstruct tty_struct *tty;\n" - "> > \302\240\n" - "> > \302\240\tif (!audit_enabled)\n" - "> > \302\240\t\treturn;\n" + "> > \303\257\302\277\302\275\n" + "> > \303\257\302\277\302\275\tif (!audit_enabled)\n" + "> > \303\257\302\277\302\275\t\treturn;\n" "> > @@ -1983,14 +1984,17 @@ static void audit_log_set_loginuid(kuid_\n" - "> > \302\240\tuid = from_kuid(&init_user_ns, task_uid(current));\n" - "> > \302\240\toldloginuid = from_kuid(&init_user_ns, koldloginuid);\n" - "> > \302\240\tloginuid = from_kuid(&init_user_ns, kloginuid),\n" + "> > \303\257\302\277\302\275\tuid = from_kuid(&init_user_ns, task_uid(current));\n" + "> > \303\257\302\277\302\275\toldloginuid = from_kuid(&init_user_ns, koldloginuid);\n" + "> > \303\257\302\277\302\275\tloginuid = from_kuid(&init_user_ns, kloginuid),\n" "> > +\ttty = audit_get_tty(current);\n" - "> > \302\240\n" - "> > \302\240\tab = audit_log_start(NULL, GFP_KERNEL, AUDIT_LOGIN);\n" - "> > \302\240\tif (!ab)\n" - "> > \302\240\t\treturn;\n" + "> > \303\257\302\277\302\275\n" + "> > \303\257\302\277\302\275\tab = audit_log_start(NULL, GFP_KERNEL, AUDIT_LOGIN);\n" + "> > \303\257\302\277\302\275\tif (!ab)\n" + "> > \303\257\302\277\302\275\t\treturn;\n" "> \n" "> This error path leaks the tty ref. Fixed upstream by:\n" "> \n" @@ -53,4 +53,4 @@ "\n" greg k-h -efec1b25ad947ed680c3db4149f172ee81b5d448c287cbe569be350786b1f0e4 +1b0fbc760674a3403f11c6d1a5a5dced24d14bcae53c93efd4a13ff45ebe71c9
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.