From: Peter Hurley <peter@hurleysoftware.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Mateusz Guzik <mguzik@redhat.com>
Cc: Jiri Slaby <jslaby@suse.com>,
stable@vger.kernel.org, linux-kernel@vger.kernel.org,
security@kernel.org, milos@redhat.com,
linux-serial@vger.kernel.org
Subject: Re: [PATCH] tty: plug a use-after-free in TIOCGETD ioctl
Date: Thu, 7 Jan 2016 08:38:04 -0800 [thread overview]
Message-ID: <568E946C.60703@hurleysoftware.com> (raw)
In-Reply-To: <20160107161418.GA28297@kroah.com>
On 01/07/2016 08:14 AM, Greg Kroah-Hartman wrote:
> Adding Peter and linux-serial to the list here, as Peter has been doing
> a ton of work in this area...
>
> Peter, does this seem sane with the tty locking rules?
>
> thanks,
>
> greg k-h
No.
Fix for this is right here:
http://lkml.iu.edu/hypermail/linux/kernel/1511.3/03045.html
Regards,
Peter Hurley
> On Thu, Jan 07, 2016 at 03:58:00PM +0100, Mateusz Guzik wrote:
>> When the line discipline is being changed, the old one is freed.
>> However, the handler for TIOCGETD would dereference it without taking
>> any locks, in effect possibly reading freed memory.
>>
>> Line discipline changes are protected with tty lock. Use it on reader
>> side as well.
>>
>> CVE: CVE-2016-0723
>> Found-by: Milos Vyletel <milos@redhat.com>
>> Signed-off-by: Mateusz Guzik <mguzik@redhat.com>
>> ---
>> drivers/tty/tty_io.c | 23 ++++++++++++++++++++++-
>> 1 file changed, 22 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
>> index 892c923..1b10469 100644
>> --- a/drivers/tty/tty_io.c
>> +++ b/drivers/tty/tty_io.c
>> @@ -2626,6 +2626,27 @@ static int tiocgsid(struct tty_struct *tty, struct tty_struct *real_tty, pid_t _
>> }
>>
>> /**
>> + * tiocgetd - get line discipline
>> + * @tty: tty device
>> + * @p: pointer to returned line discipline
>> + *
>> + * Get the line discipline associated with the tty.
>> + *
>> + * Locking: none
>> + */
>> +
>> +static int tiocgetd(struct tty_struct *tty, int __user *p)
>> +{
>> + int ldisc;
>> +
>> + tty_lock(tty);
>> + ldisc = tty->ldisc->ops->num;
>> + tty_unlock(tty);
>> +
>> + return put_user(ldisc, p);
>> +}
>> +
>> +/**
>> * tiocsetd - set line discipline
>> * @tty: tty device
>> * @p: pointer to user data
>> @@ -2874,7 +2895,7 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
>> case TIOCGSID:
>> return tiocgsid(tty, real_tty, p);
>> case TIOCGETD:
>> - return put_user(tty->ldisc->ops->num, (int __user *)p);
>> + return tiocgetd(tty, p);
>> case TIOCSETD:
>> return tiocsetd(tty, p);
>> case TIOCVHANGUP:
>> --
>> 1.8.3.1
next prev parent reply other threads:[~2016-01-07 16:38 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1452178680-30284-1-git-send-email-mguzik@redhat.com>
2016-01-07 16:14 ` [PATCH] tty: plug a use-after-free in TIOCGETD ioctl Greg Kroah-Hartman
2016-01-07 16:38 ` Peter Hurley [this message]
2016-01-07 17:08 ` Greg Kroah-Hartman
2016-01-07 17:38 ` Peter Hurley
2016-01-07 18:21 ` Greg Kroah-Hartman
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=568E946C.60703@hurleysoftware.com \
--to=peter@hurleysoftware.com \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=mguzik@redhat.com \
--cc=milos@redhat.com \
--cc=security@kernel.org \
--cc=stable@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).