Unverified Commit f902feb0 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15396 fix CVE-2024-57999 

Merge Pull Request from: @ci-robot 
 
PR sync from: Lin Yujun <linyujun809@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/4ISEUCJ6SWZANEFJVAA4XFZGBOK6UPA5/ 
Gaurav Batra (1):
  powerpc/pseries/iommu: IOMMU incorrectly marks MMIO range in DDW

 
https://gitee.com/src-openeuler/kernel/issues/IBPBNZ 
 
Link:https://gitee.com/openeuler/kernel/pulls/15396

 

Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 04fc57a7 db3d5af4

arch/powerpc/kernel/iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -686,7 +686,7 @@ static void iommu_table_clear(struct iommu_table *tbl) 
static void iommu_table_reserve_pages(struct iommu_table *tbl,

		unsigned long res_start, unsigned long res_end)

{

	int i;

	unsigned long i;



	WARN_ON_ONCE(res_end < res_start);

	/*

arch/powerpc/platforms/pseries/iommu.c

+2 −1
Original line number Diff line number Diff line
@@ -1508,7 +1508,8 @@ static bool enable_ddw(struct pci_dev *dev, struct device_node *pdn) 


		iommu_table_setparms_common(newtbl, pci->phb->bus->number, create.liobn, win_addr,

					    1UL << len, page_shift, NULL, &iommu_table_lpar_multi_ops);

		iommu_init_table(newtbl, pci->phb->node, start, end);

		iommu_init_table(newtbl, pci->phb->node,

				 start >> page_shift, end >> page_shift);



		pci->table_group->tables[1] = newtbl;