]> git.ipfire.org Git - thirdparty/linux.git/commit
iommupt: Fix unlikely flows in increase_top()
authorJason Gunthorpe <jgg@nvidia.com>
Thu, 20 Nov 2025 18:47:42 +0000 (14:47 -0400)
committerJoerg Roedel <joerg.roedel@amd.com>
Tue, 25 Nov 2025 14:11:49 +0000 (15:11 +0100)
commit152c862c172162d1bed85bfb9ecdf62fec9e86ae
tree577d5e16034abb9aebff43ec2615e013ec006bad
parent1e8b6eb1418ca2fcd10282409c0e18f73a51280f
iommupt: Fix unlikely flows in increase_top()

Since increase_top() does it's own READ_ONCE() on top_of_table, the
caller's prior READ_ONCE() could be inconsistent and the first time
through the loop we may actually already have the right level if two
threads are racing map.

In this case new_level will be left uninitialized.

Further all the exits from the loop have to either commit to the new top
or free any memory allocated so the early return must be a goto err_free.

Make it so the only break from the loop always sets new_level to the right
value and all other exits go to err_free. Use pts.level (the pts
represents the top we are stacking) within the loop instead of new_level.

Fixes: dcd6a011a8d5 ("iommupt: Add map_pages op")
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/r/aRwgNW9PiW2j-Qwo@stanley.mountain
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Alejandro Jimenez <alejandro.j.jimenez@oracle.com>
Reviewed-by: Vasant Hegde <vasant.hegde@amd.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
drivers/iommu/generic_pt/iommu_pt.h