Browse Source

Input: synaptics-rmi4 - fix an unchecked out of memory error path

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>
Christophe JAILLET 7 years ago
parent
commit
839c422736
1 changed files with 5 additions and 2 deletions
  1. 5 2
      drivers/input/rmi4/rmi_spi.c

+ 5 - 2
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)
 	if (len > RMI_SPI_XFER_SIZE_LIMIT)
 		return -EINVAL;
 		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)
 	if (addr == 0)
 		/*
 		/*