From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28BC3C433FF for ; Fri, 2 Aug 2019 13:35:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F3EC720880 for ; Fri, 2 Aug 2019 13:35:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564752907; bh=uNA+mGTVxaUDqpL+jM1PMaWa2FEDc+RSUb4fLqVBUik=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=K3ea7Y516V71WogAbWiQMOorY8LAOBlcLKIwW9kiBuwFX/ZTXEf/Rr3Lu/IfC90Xk qhp+mJnrR3DkIuaLtcTm6cNkxNkmcrL4oOsocIcz+cBlz3HIfOgOwIX1XTWPmpJta/ 6+a7UnkxxUulabtttTif82nrGqw1es8TCW59VaOU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405938AbfHBNfF (ORCPT ); Fri, 2 Aug 2019 09:35:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:60956 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393735AbfHBNWV (ORCPT ); Fri, 2 Aug 2019 09:22:21 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 93D0E21851; Fri, 2 Aug 2019 13:22:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564752140; bh=uNA+mGTVxaUDqpL+jM1PMaWa2FEDc+RSUb4fLqVBUik=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NPyiYNqNZlU0zJ5Eandd+7PW6VL9ROPe9RKaHPqo0YRwqJ7+iKf2tUTKRhl/N+F59 /PZBhhlES6awu2txp6oUnvsRIkzAg9RhUyXOyV7XMIMJMGAz5xe9riYPBcnaO1NrXu gpnWvVNmA9yGet6IPPyvRaJhFTmhGoXIEzKi2wjE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Lorenzo Pieralisi , Hanjun Guo , Dan Carpenter , Will Deacon , Sudeep Holla , Catalin Marinas , Robin Murphy , Sasha Levin , linux-acpi@vger.kernel.org Subject: [PATCH AUTOSEL 5.2 58/76] ACPI/IORT: Fix off-by-one check in iort_dev_find_its_id() Date: Fri, 2 Aug 2019 09:19:32 -0400 Message-Id: <20190802131951.11600-58-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190802131951.11600-1-sashal@kernel.org> References: <20190802131951.11600-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org From: Lorenzo Pieralisi [ 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 Reported-by: Dan Carpenter Signed-off-by: Lorenzo Pieralisi Cc: Dan Carpenter Cc: Will Deacon Cc: Hanjun Guo Cc: Sudeep Holla Cc: Catalin Marinas Cc: Robin Murphy Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- 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 d4551e33fa716..8569b79e8b581 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; } -- 2.20.1