From: Greg KH <greg@kroah.com>
To: Jiri Slaby <jslaby@suse.cz>
Cc: gregkh@suse.de, jirislaby@gmail.com,
linux-kernel@vger.kernel.org, Alan Cox <alan@lxorguk.ukuu.org.uk>
Subject: Re: TTY: ntty, add one more sanity check
Date: Tue, 7 Jun 2011 10:37:51 -0700 [thread overview]
Message-ID: <20110607173751.GA28192@kroah.com> (raw)
In-Reply-To: <4DEE6037.1020400@suse.cz>
On Tue, Jun 07, 2011 at 07:30:31PM +0200, Jiri Slaby wrote:
> On 06/07/2011 07:20 PM, Greg KH wrote:
> > On Sun, Jun 05, 2011 at 02:16:17PM +0200, Jiri Slaby wrote:
> >> With the previous patch, we fixed another bug where read_buf was freed
> >> while we still was in n_tty_read. We currently check whether read_buf
> >> is NULL at the start of the function. Add one more check after we wake
> >> up from waiting for input.
> >>
> >> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
> >> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
> >> ---
> >> drivers/tty/n_tty.c | 1 +
> >> 1 files changed, 1 insertions(+), 0 deletions(-)
> >>
> >> diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
> >> index 95d0a9c..c62c856 100644
> >> --- a/drivers/tty/n_tty.c
> >> +++ b/drivers/tty/n_tty.c
> >> @@ -1785,6 +1785,7 @@ do_it_again:
> >> break;
> >> }
> >> timeout = schedule_timeout(timeout);
> >> + BUG_ON(!tty->read_buf);
> >> continue;
> >> }
> >> __set_current_state(TASK_RUNNING);
> >
> > This doesn't apply anymore without some fuzz as stuff has changed in
> > this area in Linus's tree.
> >
> > Can you refresh it and resend it so that I know it's correct?
> >
> > Or, just verify that the diff below is correct, and I'll take that one.
>
> Yes, it's correct.
Thanks for confirming, now applied.
greg k-h
prev parent reply other threads:[~2011-06-07 17:37 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1307106096-6461-1-git-send-email-jslaby@suse.cz>
2011-06-03 13:01 ` [PATCH 2/2] TTY: ntty, add one more sanoty check Jiri Slaby
2011-06-03 13:06 ` [PATCH 1/2] TTY: ldisc, do not close until there are readers Jiri Slaby
2011-06-03 21:52 ` Linus Torvalds
[not found] ` <1307276177-20957-1-git-send-email-jslaby@suse.cz>
2011-06-05 12:16 ` [PATCH v2 2/2] TTY: ntty, add one more sanity check Jiri Slaby
2011-06-07 16:44 ` Greg KH
2011-06-07 16:57 ` Jiri Slaby
2011-06-07 17:10 ` Greg KH
2011-06-07 17:20 ` Greg KH
2011-06-07 17:30 ` Jiri Slaby
2011-06-07 17:37 ` Greg KH [this message]
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=20110607173751.GA28192@kroah.com \
--to=greg@kroah.com \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=gregkh@suse.de \
--cc=jirislaby@gmail.com \
--cc=jslaby@suse.cz \
--cc=linux-kernel@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).