Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Subject: Re: [PATCH] Input: synaptics-rmi4 - Fix an unchecked out of memory
 error path
To:     Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
        dmitry.torokhov@gmail.com, benjamin.tissoires@redhat.com,
        gregkh@linuxfoundation.org
Cc:     linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
        kernel-janitors@vger.kernel.org
References: <20180402140327.7715-1-christophe.jaillet@wanadoo.fr>
From:   Andrew Duggan <aduggan@synaptics.com>
Message-ID: <a8d419ae-4047-77af-0a1c-683bf1370e6a@synaptics.com>
Date:   Mon, 2 Apr 2018 17:52:52 -0700
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
 Thunderbird/52.7.0
MIME-Version: 1.0
In-Reply-To: <20180402140327.7715-1-christophe.jaillet@wanadoo.fr>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
Content-Language: en-US
Received-SPF: None (protection.outlook.com: synaptics.com does not designate
 permitted sender hosts)
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Apr 2018 00:53:44.7329 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: de2392cb-0160-45b6-13df-08d598fd5b49
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 335d1fbc-2124-4173-9863-17e7051a2a0e
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR03MB2578
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 04/02/2018 07:03 AM, Christophe JAILLET wrote:
> When extending the rmi_spi buffers, we must check that no out of memory
> error occurs, otherwise we may access data above the currently allocated
> memory.
>
> Propagate the error code returned by 'rmi_spi_manage_pools()' instead.
Yep, that definitely looks like an oversight on my part. Thanks for the fix.

Andrew

> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

Reviewed-by: Andrew Duggan <aduggan@synaptics.com>

> ---
>   drivers/input/rmi4/rmi_spi.c | 7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/input/rmi4/rmi_spi.c b/drivers/input/rmi4/rmi_spi.c
> index 76edbf2c1bce..082defc329a8 100644
> --- a/drivers/input/rmi4/rmi_spi.c
> +++ b/drivers/input/rmi4/rmi_spi.c
> @@ -147,8 +147,11 @@ static int rmi_spi_xfer(struct rmi_spi_xport *rmi_spi,
>   	if (len > RMI_SPI_XFER_SIZE_LIMIT)
>   		return -EINVAL;
>   
> -	if (rmi_spi->xfer_buf_size < len)
> -		rmi_spi_manage_pools(rmi_spi, len);
> +	if (rmi_spi->xfer_buf_size < len) {
> +		ret = rmi_spi_manage_pools(rmi_spi, len);
> +		if (ret < 0)
> +			return ret;
> +	}
>   
>   	if (addr == 0)
>   		/*