Commit f78e1b84 authored by Li RongQing's avatar Li RongQing Committed by Liu Shixin
Browse files

dmaengine: idxd: Fix possible Use-After-Free in irq_process_work_list

stable inclusion
from stable-v6.6.36
commit faa35db78b058a2ab6e074ee283f69fa398c36a8
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IACZX7
CVE: CVE-2024-40956

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=faa35db78b058a2ab6e074ee283f69fa398c36a8



--------------------------------

[ 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: 16e19e11 ("dmaengine: idxd: Fix list corruption in description completion")
Signed-off-by: default avatarLi RongQing <lirongqing@baidu.com>
Reviewed-by: default avatarDave Jiang <dave.jiang@intel.com>
Reviewed-by: default avatarFenghua Yu <fenghua.yu@intel.com>
Link: https://lore.kernel.org/r/20240603012444.11902-1-lirongqing@baidu.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarLiu Shixin <liushixin2@huawei.com>
parent ec1052d5
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -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;