| From 92351003818c67d313b2fa8ebe9dcbdb8c77100f Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 6 May 2021 15:08:08 +0800 |
| Subject: spi: spi-topcliff-pch: Fix potential double free in |
| pch_spi_process_messages() |
| |
| From: Jay Fang <f.fangjian@huawei.com> |
| |
| [ Upstream commit 026a1dc1af52742c5897e64a3431445371a71871 ] |
| |
| pch_spi_set_tx() frees data->pkt_tx_buff on failure of kzalloc() for |
| data->pkt_rx_buff, but its caller, pch_spi_process_messages(), will |
| free data->pkt_tx_buff again. Set data->pkt_tx_buff to NULL after |
| kfree() to avoid double free. |
| |
| Signed-off-by: Jay Fang <f.fangjian@huawei.com> |
| Link: https://lore.kernel.org/r/1620284888-65215-1-git-send-email-f.fangjian@huawei.com |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/spi/spi-topcliff-pch.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c |
| index b459e369079f..7fb020a1d66a 100644 |
| --- a/drivers/spi/spi-topcliff-pch.c |
| +++ b/drivers/spi/spi-topcliff-pch.c |
| @@ -580,8 +580,10 @@ static void pch_spi_set_tx(struct pch_spi_data *data, int *bpw) |
| data->pkt_tx_buff = kzalloc(size, GFP_KERNEL); |
| if (data->pkt_tx_buff != NULL) { |
| data->pkt_rx_buff = kzalloc(size, GFP_KERNEL); |
| - if (!data->pkt_rx_buff) |
| + if (!data->pkt_rx_buff) { |
| kfree(data->pkt_tx_buff); |
| + data->pkt_tx_buff = NULL; |
| + } |
| } |
| |
| if (!data->pkt_rx_buff) { |
| -- |
| 2.30.2 |
| |