AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

firmware: stratix10-svc: fix a missing check on list iterator

Browse Source 
[ Upstream commit 5a0793ac66ac0e254d292f129a4d6c526f9f2aff ]

The bug is here:
	pmem->vaddr = NULL;

The list iterator 'pmem' will point to a bogus position containing
HEAD if the list is empty or no element is found. This case must
be checked before any use of the iterator, otherwise it will
lead to a invalid memory access.

To fix this bug, just gen_pool_free/set NULL/list_del() and return
when found, otherwise list_del HEAD and return;

Fixes: 7ca5ce8965 ("firmware: add Intel Stratix10 service layer driver")
Signed-off-by: Xiaomeng Tong <xiam0nd.tong@gmail.com>
Link: https://lore.kernel.org/r/20220414035609.2239-1-xiam0nd.tong@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Xiaomeng Tong 2022-04-14 11:56:09 +08:00 committed by Greg Kroah-Hartman
parent 70ece3c5ec
commit 7027c890ff
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/firmware/stratix10-svc.c
View File

@ -941,17 +941,17 @@ EXPORT_SYMBOL_GPL(stratix10_svc_allocate_memory);
void stratix10_svc_free_memory(struct stratix10_svc_chan *chan, void *kaddr) void stratix10_svc_free_memory(struct stratix10_svc_chan *chan, void *kaddr)
{ {
struct stratix10_svc_data_mem *pmem; struct stratix10_svc_data_mem *pmem;
size_t size = 0;
list_for_each_entry(pmem, &svc_data_mem, node) list_for_each_entry(pmem, &svc_data_mem, node)
if (pmem->vaddr == kaddr) { if (pmem->vaddr == kaddr) {
size = pmem->size; gen_pool_free(chan->ctrl->genpool,
break; (unsigned long)kaddr, pmem->size);
pmem->vaddr = NULL;
list_del(&pmem->node);
return;
} }
gen_pool_free(chan->ctrl->genpool, (unsigned long)kaddr, size); list_del(&svc_data_mem);
pmem->vaddr = NULL;
list_del(&pmem->node);
} }
EXPORT_SYMBOL_GPL(stratix10_svc_free_memory); EXPORT_SYMBOL_GPL(stratix10_svc_free_memory);