| From aad323b56ecffb6e3fa25c23bfac6bc6aaa97ff6 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 3 Jun 2024 09:24:44 +0800 |
| Subject: dmaengine: idxd: Fix possible Use-After-Free in irq_process_work_list |
| |
| From: Li RongQing <lirongqing@baidu.com> |
| |
| [ Upstream commit e3215deca4520773cd2b155bed164c12365149a7 ] |
| |
| Use list_for_each_entry_safe() to allow iterating through the list and |
| deleting the entry in the iteration process. The descriptor is freed via |
| idxd_desc_complete() and there's a slight chance may cause issue for |
| the list iterator when the descriptor is reused by another thread |
| without it being deleted from the list. |
| |
| Fixes: 16e19e11228b ("dmaengine: idxd: Fix list corruption in description completion") |
| Signed-off-by: Li RongQing <lirongqing@baidu.com> |
| Reviewed-by: Dave Jiang <dave.jiang@intel.com> |
| Reviewed-by: Fenghua Yu <fenghua.yu@intel.com> |
| Link: https://lore.kernel.org/r/20240603012444.11902-1-lirongqing@baidu.com |
| Signed-off-by: Vinod Koul <vkoul@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/dma/idxd/irq.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/dma/idxd/irq.c b/drivers/dma/idxd/irq.c |
| index aa314ebec5878..4a3eb96b8199a 100644 |
| --- a/drivers/dma/idxd/irq.c |
| +++ b/drivers/dma/idxd/irq.c |
| @@ -454,11 +454,13 @@ static void irq_process_work_list(struct idxd_irq_entry *irq_entry) |
| |
| spin_unlock(&irq_entry->list_lock); |
| |
| - list_for_each_entry(desc, &flist, list) { |
| + list_for_each_entry_safe(desc, n, &flist, list) { |
| /* |
| * Check against the original status as ABORT is software defined |
| * and 0xff, which DSA_COMP_STATUS_MASK can mask out. |
| */ |
| + list_del(&desc->list); |
| + |
| if (unlikely(desc->completion->status == IDXD_COMP_DESC_ABORT)) { |
| idxd_dma_complete_txd(desc, IDXD_COMPLETE_ABORT, true); |
| continue; |
| -- |
| 2.43.0 |
| |
