Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

iommu/io-pgtable-dart: Fix off by one error in table index check

The check for the dart table index allowed values of
(1 << data->tbl_bits) while only as many entries are initialized in
apple_dart_alloc_pgtable. This results in an array out of bounds access
when data->tbl_bits is at its maximal value of 2. When data->tbl_bits is
0 or 1 an unset (initialized to zero) data->pgd[] entry is used. In both
cases the value is used as pointer to read page table entries and
results in dereferencing invalid pointers.
There is no prior check that the passed iova is inside the iommu's IAS
so invalid values can be passed from driver's calling iommu_map().

Fixes: 74a0e72f03ff ("iommu/io-pgtable-dart: Add 4-level page table support")
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/asahi/aMACFlJjrZHs_Yf-@stanley.mountain/
Signed-off-by: Janne Grunau <j@jannau.net>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>

authored by

Janne Grunau and committed by
Joerg Roedel
a2d2e6ea ecf65089

+2 -2
+2 -2
drivers/iommu/io-pgtable-dart.c
··· 177 177 int level = data->levels; 178 178 int tbl = dart_get_index(data, iova, level); 179 179 180 - if (tbl > (1 << data->tbl_bits)) 180 + if (tbl >= (1 << data->tbl_bits)) 181 181 return NULL; 182 182 183 183 ptep = data->pgd[tbl]; ··· 246 246 247 247 tbl = dart_get_index(data, iova, level); 248 248 249 - if (tbl > (1 << data->tbl_bits)) 249 + if (tbl >= (1 << data->tbl_bits)) 250 250 return -ENOMEM; 251 251 252 252 ptep = data->pgd[tbl];