From: Dmitry Safonov <dima@arista.com>
To: linux-kernel@vger.kernel.org
Cc: "Dmitry Safonov" <0x7f454c46@gmail.com>,
"Dmitry Safonov" <dima@arista.com>,
"Daniel Axtens" <dja@axtens.net>,
"Dmitry Vyukov" <dvyukov@google.com>,
"Mark Rutland" <mark.rutland@arm.com>,
"Michael Neuling" <mikey@neuling.org>,
"Mikulas Patocka" <mpatocka@redhat.com>,
"Nathan March" <nathan@gt.net>, "Pasi Kärkkäinen" <pasik@iki.fi>,
"Peter Hurley" <peter@hurleysoftware.com>,
"Peter Zijlstra" <peterz@infradead.org>,
"Rong, Chen" <rong.a.chen@intel.com>,
"Sergey Senozhatsky" <sergey.senozhatsky.work@gmail.com>,
"Tan Xiaojun" <tanxiaojun@huawei.com>,
"Tetsuo Handa" <penguin-kernel@I-love.SAKURA.ne.jp>,
"Jiri Slaby" <jslaby@suse.cz>,
syzbot+3aa9784721dfb90e984d@syzkaller.appspotmail.com,
"Tetsuo Handa" <penguin-kernel@i-love.sakura.ne.jp>,
stable@vger.kernel.org,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Jiri Slaby" <jslaby@suse.com>
Subject: [PATCHv5 3/7] tty: Hold tty_ldisc_lock() during tty_reopen()
Date: Tue, 18 Sep 2018 00:52:54 +0100 [thread overview]
Message-ID: <20180917235258.5719-4-dima@arista.com> (raw)
In-Reply-To: <20180917235258.5719-1-dima@arista.com>
tty_ldisc_reinit() doesn't race with neither tty_ldisc_hangup()
nor set_ldisc() nor tty_ldisc_release() as they use tty lock.
But it races with anyone who expects line discipline to be the same
after hoding read semaphore in tty_ldisc_ref().
We've seen the following crash on v4.9.108 stable:
BUG: unable to handle kernel paging request at 0000000000002260
IP: [..] n_tty_receive_buf_common+0x5f/0x86d
Workqueue: events_unbound flush_to_ldisc
Call Trace:
[..] n_tty_receive_buf2
[..] tty_ldisc_receive_buf
[..] flush_to_ldisc
[..] process_one_work
[..] worker_thread
[..] kthread
[..] ret_from_fork
tty_ldisc_reinit() should be called with ldisc_sem hold for writing,
which will protect any reader against line discipline changes.
Backport-first: b027e2298bd5 ("tty: fix data race between tty_init_dev
and flush of buf")
Cc: stable@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.com>
Reviewed-by: Jiri Slaby <jslaby@suse.cz>
Reported-by: syzbot+3aa9784721dfb90e984d@syzkaller.appspotmail.com
Tested-by: Mark Rutland <mark.rutland@arm.com>
Tested-by: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
drivers/tty/tty_io.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 5e5da9acaf0a..3ef8b977b167 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -1267,15 +1267,20 @@ static int tty_reopen(struct tty_struct *tty)
if (test_bit(TTY_EXCLUSIVE, &tty->flags) && !capable(CAP_SYS_ADMIN))
return -EBUSY;
- tty->count++;
+ retval = tty_ldisc_lock(tty, 5 * HZ);
+ if (retval)
+ return retval;
+ tty->count++;
if (tty->ldisc)
- return 0;
+ goto out_unlock;
retval = tty_ldisc_reinit(tty, tty->termios.c_line);
if (retval)
tty->count--;
+out_unlock:
+ tty_ldisc_unlock(tty);
return retval;
}
--
2.13.6
next prev parent reply other threads:[~2018-09-17 23:53 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-17 23:52 [PATCHv5 0/7] tty: Hold write ldisc sem in tty_reopen() Dmitry Safonov
2018-09-17 23:52 ` [PATCHv5 1/7] tty: Drop tty->count on tty_reopen() failure Dmitry Safonov
2018-09-18 13:41 ` Greg Kroah-Hartman
2018-09-18 14:15 ` Dmitry Safonov
2018-09-17 23:52 ` [PATCHv5 2/7] tty/ldsem: Wake up readers after timed out down_write() Dmitry Safonov
2018-09-18 13:43 ` Greg Kroah-Hartman
2018-09-18 14:12 ` Dmitry Safonov
2018-09-17 23:52 ` Dmitry Safonov [this message]
2018-09-18 13:47 ` [PATCHv5 3/7] tty: Hold tty_ldisc_lock() during tty_reopen() Greg Kroah-Hartman
2018-09-18 14:19 ` Dmitry Safonov
2018-09-17 23:52 ` [PATCHv5 4/7] tty: Simplify tty->count math in tty_reopen() Dmitry Safonov
2018-09-17 23:52 ` [PATCHv5 5/7] tty/ldsem: Convert to regular lockdep annotations Dmitry Safonov
2018-09-17 23:52 ` [PATCHv5 6/7] tty/ldsem: Add lockdep asserts for ldisc_sem Dmitry Safonov
2018-09-18 13:49 ` Greg Kroah-Hartman
2018-09-18 14:21 ` Dmitry Safonov
2018-09-17 23:52 ` [PATCHv5 7/7] tty/ldsem: Decrement wait_readers on timeouted down_read() Dmitry Safonov
2018-09-19 16:56 ` [PATCHv5 0/7] tty: Hold write ldisc sem in tty_reopen() Mikulas Patocka
2018-09-19 17:35 ` Mikulas Patocka
2018-09-19 17:45 ` Dmitry Safonov
2018-09-19 20:03 ` Mikulas Patocka
2018-09-19 20:21 ` Dmitry Safonov
2018-09-20 14:25 ` Mikulas Patocka
2018-10-15 13:37 ` Pasi Kärkkäinen
[not found] <8c61fd04-969a-cb09-6595-7ee23d214ab1@canonical.com>
2018-10-01 19:01 ` [PATCHv5 3/7] tty: Hold tty_ldisc_lock() during tty_reopen() Guilherme G. Piccoli
2018-10-02 21:33 ` Dmitry Safonov
2018-10-03 10:46 ` Guilherme Piccoli
2018-10-12 15:57 ` Dmitry Safonov
2018-10-15 12:16 ` Guilherme Piccoli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180917235258.5719-4-dima@arista.com \
--to=dima@arista.com \
--cc=0x7f454c46@gmail.com \
--cc=dja@axtens.net \
--cc=dvyukov@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.com \
--cc=jslaby@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mikey@neuling.org \
--cc=mpatocka@redhat.com \
--cc=nathan@gt.net \
--cc=pasik@iki.fi \
--cc=penguin-kernel@I-love.SAKURA.ne.jp \
--cc=peter@hurleysoftware.com \
--cc=peterz@infradead.org \
--cc=rong.a.chen@intel.com \
--cc=sergey.senozhatsky.work@gmail.com \
--cc=stable@vger.kernel.org \
--cc=syzbot+3aa9784721dfb90e984d@syzkaller.appspotmail.com \
--cc=tanxiaojun@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.