| From foo@baz Sun Jun 17 12:07:33 CEST 2018 |
| From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| Date: Fri, 6 Apr 2018 15:36:11 -0700 |
| Subject: Input: synaptics-rmi4 - fix an unchecked out of memory error path |
| |
| From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| |
| [ Upstream commit 839c42273617787318da7baf6151d553108f5e17 ] |
| |
| 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. |
| |
| Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| Reviewed-by: Andrew Duggan <aduggan@synaptics.com> |
| Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/input/rmi4/rmi_spi.c | 7 +++++-- |
| 1 file changed, 5 insertions(+), 2 deletions(-) |
| |
| --- 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_x |
| 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) |
| /* |
