| Message ID | 20190722162548.23610-1-lorenzo.pieralisi@arm.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 5a46d3f71d5e5a9f82eabc682f996f1281705ac7 |
| Headers | show |
| Series | ACPI/IORT: Fix off-by-one check in iort_dev_find_its_id() | expand |
On 2019/7/23 0:25, Lorenzo Pieralisi wrote: > Static analysis identified that index comparison against ITS entries in > iort_dev_find_its_id() is off by one. > > Update the comparison condition and clarify the resulting error > message. > > Fixes: 4bf2efd26d76 ("ACPI: Add new IORT functions to support MSI domain handling") > Link: https://lore.kernel.org/linux-arm-kernel/20190613065410.GB16334@mwanda/ > Reported-by: Dan Carpenter <dan.carpenter@oracle.com> > Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > Cc: Dan Carpenter <dan.carpenter@oracle.com> > Cc: Will Deacon <will@kernel.org> > Cc: Hanjun Guo <guohanjun@huawei.com> > Cc: Sudeep Holla <sudeep.holla@arm.com> > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Robin Murphy <robin.murphy@arm.com> Reviewed-by: Hanjun Guo <guohanjun@huawei.com>
diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c index 15dbfd657d82..5a7551d060f2 100644 --- a/drivers/acpi/arm64/iort.c +++ b/drivers/acpi/arm64/iort.c @@ -611,8 +611,8 @@ static int iort_dev_find_its_id(struct device *dev, u32 req_id, /* Move to ITS specific data */ its = (struct acpi_iort_its_group *)node->node_data; - if (idx > its->its_count) { - dev_err(dev, "requested ITS ID index [%d] is greater than available [%d]\n", + if (idx >= its->its_count) { + dev_err(dev, "requested ITS ID index [%d] overruns ITS entries [%d]\n", idx, its->its_count); return -ENXIO; }
Static analysis identified that index comparison against ITS entries in iort_dev_find_its_id() is off by one. Update the comparison condition and clarify the resulting error message. Fixes: 4bf2efd26d76 ("ACPI: Add new IORT functions to support MSI domain handling") Link: https://lore.kernel.org/linux-arm-kernel/20190613065410.GB16334@mwanda/ Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Dan Carpenter <dan.carpenter@oracle.com> Cc: Will Deacon <will@kernel.org> Cc: Hanjun Guo <guohanjun@huawei.com> Cc: Sudeep Holla <sudeep.holla@arm.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Robin Murphy <robin.murphy@arm.com> --- drivers/acpi/arm64/iort.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)