Merge "soc: qcom: glink: Return error in case of invalid input" (48d1f0d2) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/soc/qcom/glink_smem_native_xprt.c

+8 −4

Original line number	Diff line number	Diff line
		@@ -483,8 +483,10 @@ static int fifo_read(struct edge_info einfo, void _data, int len)
		uint32_t fifo_size = einfo->rx_fifo_size;
		uint32_t n;

		if (read_index >= fifo_size \|\| write_index >= fifo_size)
		return 0;
		if (read_index >= fifo_size \|\| write_index >= fifo_size) {
		WARN_ON_ONCE(1);
		return -EINVAL;
		}
		while (len) {
		ptr = einfo->rx_fifo + read_index;
		if (read_index <= write_index)
		@@ -531,8 +533,10 @@ static int fifo_write_body(struct edge_info einfo, const void _data,
		uint32_t fifo_size = einfo->tx_fifo_size;
		uint32_t n;

		if (read_index >= fifo_size \|\| *write_index >= fifo_size)
		return 0;
		if (read_index >= fifo_size \|\| *write_index >= fifo_size) {
		WARN_ON_ONCE(1);
		return -EINVAL;
		}
		while (len) {
		ptr = einfo->tx_fifo + *write_index;
		if (*write_index < read_index) {