| From e7252cd8dbf39dfcd335e253b44992761a08a37d Mon Sep 17 00:00:00 2001 |
| From: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> |
| Date: Mon, 22 Jul 2019 17:25:48 +0100 |
| Subject: ACPI/IORT: Fix off-by-one check in iort_dev_find_its_id() |
| |
| [ Upstream commit 5a46d3f71d5e5a9f82eabc682f996f1281705ac7 ] |
| |
| 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/ |
| Reviewed-by: Hanjun Guo <guohanjun@huawei.com> |
| 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> |
| Signed-off-by: Will Deacon <will@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/acpi/arm64/iort.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c |
| index ca414910710ea..b0a7afd4e7d35 100644 |
| --- a/drivers/acpi/arm64/iort.c |
| +++ b/drivers/acpi/arm64/iort.c |
| @@ -506,8 +506,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; |
| } |
| -- |
| 2.20.1 |
| |
