From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751807AbbAAOGq (ORCPT <rfc822;w@1wt.eu>);
	Thu, 1 Jan 2015 09:06:46 -0500
Received: from mail-qa0-f45.google.com ([209.85.216.45]:52617 "EHLO
	mail-qa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751164AbbAAOGn (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Thu, 1 Jan 2015 09:06:43 -0500
Message-ID: <54A5546A.6080804@hurleysoftware.com>
Date: Thu, 01 Jan 2015 09:06:34 -0500
From: Peter Hurley <peter@hurleysoftware.com>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0
MIME-Version: 1.0
To: Christian Riesch <christian.riesch@omicron.at>
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Jiri Slaby <jslaby@suse.cz>, linux-serial@vger.kernel.org,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        stable <stable@vger.kernel.org>
Subject: Re: [PATCH] n_tty: Fix unordered accesses to lockless read buffer
References: <1419941156-5303-1-git-send-email-peter@hurleysoftware.com>	<CABkLObqhqE7Y3eD2gUxmqb0etfvYcDYRnE=-i=-4j=4Ea6=F-w@mail.gmail.com> <CABkLObp9jt6y94Ss6H=F2UGm4n1kv9jJU2tJfdg+EUO=e=BVNw@mail.gmail.com>
In-Reply-To: <CABkLObp9jt6y94Ss6H=F2UGm4n1kv9jJU2tJfdg+EUO=e=BVNw@mail.gmail.com>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Christian,

On 01/01/2015 08:55 AM, Christian Riesch wrote:
> On Thu, Jan 1, 2015 at 12:00 PM, Christian Riesch >> @@ -164,15
> +160,17 @@ static inline int tty_put_user(struct tty_struct *tty,
> unsigned char x,
>>>  static int receive_room(struct tty_struct *tty)
>>>  {
>>>         struct n_tty_data *ldata = tty->disc_data;
>>> +       size_t head = ACCESS_ONCE(ldata->commit_head);
>>> +       size_t tail = ACCESS_ONCE(ldata->read_tail);
>>>         int left;
>>>
>>>         if (I_PARMRK(tty)) {
>>> -               /* Multiply read_cnt by 3, since each byte might take up to
>>> +               /* Multiply count by 3, since each byte might take up to
>>>                  * three times as many spaces when PARMRK is set (depending on
>>>                  * its flags, e.g. parity error). */
>>> -               left = N_TTY_BUF_SIZE - read_cnt(ldata) * 3 - 1;
>>> +               left = N_TTY_BUF_SIZE - (head - tail) * 3 - 1;
>>>         } else
>>> -               left = N_TTY_BUF_SIZE - read_cnt(ldata) - 1;
>>> +               left = N_TTY_BUF_SIZE - (head - tail) - 1;
>>
>> Actually, less room may be available, if read_head != commit_head.
>> Could this cause problems? I guess yes, at least in
>> n_tty_receive_buf_common, where this could lead to a buffer overflow,
>> right?
> 
> Sorry, should not be a problem, at least not for
> n_tty_receive_buf_common, since this is producer path, right?

Yeah, that's what I was in the process of writing just now.
BTW, I did see your note about the I_PARMRK computation being
overly conservative; I'll address that in a separate patch
on top of this.

> But how about the other calls of receive_room()?

Those are all either consumer-side or exclusive, ie., when both
producer and consumer are prevented from running by the termios_rwsem
write lock (eg., n_tty_set_termios()).