Commit 45ba5b3c authored by Ashish Kalra's avatar Ashish Kalra Committed by Borislav Petkov (AMD)
Browse files

iommu/amd: Fix failure return from snp_lookup_rmpentry() 

Commit

  f366a8da: ("iommu/amd: Clean up RMP entries for IOMMU pages during SNP shutdown")

leads to the following Smatch static checker warning:

  drivers/iommu/amd/init.c:3820 iommu_page_make_shared() error: uninitialized symbol 'assigned'.

Fix it.

  [ bp: Address the other error cases too. ]

Fixes: f366a8da ("iommu/amd: Clean up RMP entries for IOMMU pages during SNP shutdown")
Closes: https://lore.kernel.org/linux-iommu/1be69f6a-e7e1-45f9-9a74-b2550344f3fd@moroto.mountain


Reported-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: default avatarAshish Kalra <ashish.kalra@amd.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Cc: Joerg Roedel <jroedel@suse.com>
Link: https://lore.kernel.org/lkml/20240126041126.1927228-20-michael.roth@amd.com
parent 1c811d40

drivers/iommu/amd/init.c

+15 −10
Original line number Diff line number Diff line
@@ -3813,23 +3813,28 @@ static int iommu_page_make_shared(void *page) 
		bool assigned;



		ret = snp_lookup_rmpentry(pfn, &assigned, &level);

		if (ret)

			pr_warn("IOMMU PFN %lx RMP lookup failed, ret %d\n",

				pfn, ret);

		if (ret) {

			pr_warn("IOMMU PFN %lx RMP lookup failed, ret %d\n", pfn, ret);

			return ret;

		}



		if (!assigned)

			pr_warn("IOMMU PFN %lx not assigned in RMP table\n",

				pfn);

		if (!assigned) {

			pr_warn("IOMMU PFN %lx not assigned in RMP table\n", pfn);

			return -EINVAL;

		}



		if (level > PG_LEVEL_4K) {

			ret = psmash(pfn);

			if (ret) {

				pr_warn("IOMMU PFN %lx had a huge RMP entry, but attempted psmash failed, ret: %d, level: %d\n",

			if (!ret)

				goto done;



			pr_warn("PSMASH failed for IOMMU PFN %lx huge RMP entry, ret: %d, level: %d\n",

				pfn, ret, level);

			}

			return ret;

		}

	}



done:

	return rmp_make_shared(pfn, PG_LEVEL_4K);

}