Re: [PATCH] Input: synaptics-rmi4 - Fix an unchecked out of memory error path

[Dmitry Torokhov]

On Mon, Apr 02, 2018 at 05:52:52PM -0700, Andrew Duggan wrote:
> 
> 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@xxxxxxxxxx>
> 
> Reviewed-by: Andrew Duggan <aduggan@xxxxxxxxxxxxx>

Applied, thank you.

> 
> > ---
> >   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)
> >   		/*
> 

-- 
Dmitry