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>, "Jiri Slaby" <jslaby@suse.com>,
"Tetsuo Handa" <penguin-kernel@i-love.sakura.ne.jp>,
stable@vger.kernel.org,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>
Subject: [PATCHv5 1/7] tty: Drop tty->count on tty_reopen() failure
Date: Tue, 18 Sep 2018 00:52:52 +0100 [thread overview]
Message-ID: <20180917235258.5719-2-dima@arista.com> (raw)
In-Reply-To: <20180917235258.5719-1-dima@arista.com>
In case of tty_ldisc_reinit() failure, tty->count should be decremented
back, otherwise we will never release_tty().
Tetsuo reported that it fixes noisy warnings on tty release like:
pts pts4033: tty_release: tty->count(10529) != (#fd's(7) + #kopen's(0))
Fixes: commit 892d1fa7eaae ("tty: Destroy ldisc instance on hangup")
Cc: stable@vger.kernel.org # v4.6+
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.com>
Reviewed-by: Jiri Slaby <jslaby@suse.cz>
Tested-by: Jiri Slaby <jslaby@suse.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 | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 32bc3e3fe4d3..5e5da9acaf0a 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -1255,6 +1255,7 @@ static void tty_driver_remove_tty(struct tty_driver *driver, struct tty_struct *
static int tty_reopen(struct tty_struct *tty)
{
struct tty_driver *driver = tty->driver;
+ int retval;
if (driver->type == TTY_DRIVER_TYPE_PTY &&
driver->subtype == PTY_TYPE_MASTER)
@@ -1268,10 +1269,14 @@ static int tty_reopen(struct tty_struct *tty)
tty->count++;
- if (!tty->ldisc)
- return tty_ldisc_reinit(tty, tty->termios.c_line);
+ if (tty->ldisc)
+ return 0;
- return 0;
+ retval = tty_ldisc_reinit(tty, tty->termios.c_line);
+ if (retval)
+ tty->count--;
+
+ return retval;
}
/**
--
2.13.6
next prev parent reply other threads:[~2018-09-17 23:53 UTC|newest]
Thread overview: 23+ 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 ` Dmitry Safonov [this message]
2018-09-18 13:41 ` [PATCHv5 1/7] tty: Drop tty->count on tty_reopen() failure 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 ` [PATCHv5 3/7] tty: Hold tty_ldisc_lock() during tty_reopen() Dmitry Safonov
2018-09-18 13:47 ` 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
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-2-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=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.