From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S940166AbdEXNo5 (ORCPT ); Wed, 24 May 2017 09:44:57 -0400 Received: from www.llwyncelyn.cymru ([82.70.14.225]:58610 "EHLO fuzix.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935700AbdEXNoz (ORCPT ); Wed, 24 May 2017 09:44:55 -0400 Date: Wed, 24 May 2017 14:44:33 +0100 From: Alan Cox To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, Tilman Schmidt , Sasha Levin , Peter Hurley , Amit Pundir Subject: Re: [PATCH 3.18 34/59] tty: Prevent ldisc drivers from re-using stale tty fields Message-ID: <20170524144433.28ddf836@alans-desktop> In-Reply-To: <20170523200851.752940269@linuxfoundation.org> References: <20170523200849.241966497@linuxfoundation.org> <20170523200851.752940269@linuxfoundation.org> Organization: Intel Corporation X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 23 May 2017 22:10:02 +0200 Greg Kroah-Hartman wrote: > 3.18-stable review patch. If anyone has any objections, please let me know. > Thiis is a patch designed to cause a crash in order to stop future errors occurring. It seems less than ideal as a stable candidate. > ------------------ > > From: Peter Hurley > > commit dd42bf1197144ede075a9d4793123f7689e164bc upstream. > > Line discipline drivers may mistakenly misuse ldisc-related fields > when initializing. For example, a failure to initialize tty->receive_room > in the N_GIGASET_M101 line discipline was recently found and fixed [1]. > Now, the N_X25 line discipline has been discovered accessing the previous > line discipline's already-freed private data [2]. > > Harden the ldisc interface against misuse by initializing revelant > tty fields before instancing the new line discipline. > > [1] > commit fd98e9419d8d622a4de91f76b306af6aa627aa9c > Author: Tilman Schmidt > Date: Tue Jul 14 00:37:13 2015 +0200 > > isdn/gigaset: reset tty->receive_room when attaching ser_gigaset > > [2] Report from Sasha Levin > [ 634.336761] ================================================================== > [ 634.338226] BUG: KASAN: use-after-free in x25_asy_open_tty+0x13d/0x490 at addr ffff8800a743efd0 > [ 634.339558] Read of size 4 by task syzkaller_execu/8981 > [ 634.340359] ============================================================================= > [ 634.341598] BUG kmalloc-512 (Not tainted): kasan: bad access detected > ... > [ 634.405018] Call Trace: > [ 634.405277] dump_stack (lib/dump_stack.c:52) > [ 634.405775] print_trailer (mm/slub.c:655) > [ 634.406361] object_err (mm/slub.c:662) > [ 634.406824] kasan_report_error (mm/kasan/report.c:138 mm/kasan/report.c:236) > [ 634.409581] __asan_report_load4_noabort (mm/kasan/report.c:279) > [ 634.411355] x25_asy_open_tty (drivers/net/wan/x25_asy.c:559 (discriminator 1)) > [ 634.413997] tty_ldisc_open.isra.2 (drivers/tty/tty_ldisc.c:447) > [ 634.414549] tty_set_ldisc (drivers/tty/tty_ldisc.c:567) > [ 634.415057] tty_ioctl (drivers/tty/tty_io.c:2646 drivers/tty/tty_io.c:2879) > [ 634.423524] do_vfs_ioctl (fs/ioctl.c:43 fs/ioctl.c:607) > [ 634.427491] SyS_ioctl (fs/ioctl.c:622 fs/ioctl.c:613) > [ 634.427945] entry_SYSCALL_64_fastpath (arch/x86/entry/entry_64.S:188) > > Cc: Tilman Schmidt > Cc: Sasha Levin > Signed-off-by: Peter Hurley > Signed-off-by: Amit Pundir > Signed-off-by: Greg Kroah-Hartman > > --- > drivers/tty/tty_ldisc.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > --- a/drivers/tty/tty_ldisc.c > +++ b/drivers/tty/tty_ldisc.c > @@ -414,6 +414,10 @@ EXPORT_SYMBOL_GPL(tty_ldisc_flush); > * they are not on hot paths so a little discipline won't do > * any harm. > * > + * The line discipline-related tty_struct fields are reset to > + * prevent the ldisc driver from re-using stale information for > + * the new ldisc instance. > + * > * Locking: takes termios_rwsem > */ > > @@ -422,6 +426,9 @@ static void tty_set_termios_ldisc(struct > down_write(&tty->termios_rwsem); > tty->termios.c_line = num; > up_write(&tty->termios_rwsem); > + > + tty->disc_data = NULL; > + tty->receive_room = 0; > } > > /** >