From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 50AA819D06E; Mon, 17 Jun 2024 13:27:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718630834; cv=none; b=jju/hP8t58jI8TGXVPJPD/yHpJeYE0IDZRnHidtAR6c8JIL8kpZ9Yq1Ki9WzJJG1BBwxVTlEGfAIVXhibfmytDTxv4Ac8jABwaYCP1IZtq/faOHs4y8c5xtZRYfPCS08UlkazOKLPHbx+dL3klErMFTTSVKacpxUZeIHduNiXoA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718630834; c=relaxed/simple; bh=q6KG4SzbjjUNOFAPaFCztkOVr1JCI+IZQ7tSb7LBrNA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UBJLfynQpBqGkvD+UIBUKuNoR+nlZw+5mEXtcbZr7uMGuZcGonMZcIg90demUNbMNjZr25+PcW8TFtlhmfLvuwb1SkodXhCSzz5yFa8b1gXc6HrU9VsdMcKxdaOx+2nVpQBLYbZwvV22QwPK70aNBOjLCKMIn3gq0GfmrLLSqjA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VCNu1Zi3; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="VCNu1Zi3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5F0FCC4AF1D; Mon, 17 Jun 2024 13:27:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1718630834; bh=q6KG4SzbjjUNOFAPaFCztkOVr1JCI+IZQ7tSb7LBrNA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VCNu1Zi3D6rUF9QZgrThmoPk1XYo7dB+aOYOsijhGaai9hs7kH29jlB1ZKRJc/Jhg 4DOOxMOaCkEMEA5O8woK30F+dkvHBbEsXXu9XYK26+dqMYoj6Mq2ybWYNgrHXfaitT btY3HTscw44hzZiEzpAN9xVTQaL1lNkas1G79AJi5rE/wBm+1uGPB2wNYzWiHOnmaL dJAhMrCW8Dy48nmMbghnIIXckkKS+cpqYeRdSM98TFVK6cRQWDctSnvOT4B12+q8z1 YRG6M+GRwrvgouTqSdaBIqevzmcUQTkktKv1TYDsHjQjz0OdQUhEMg2IZf/krKsUra tLYq8s4GDOHdQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Armin Wolf , "Rafael J . Wysocki" , Sasha Levin , rafael@kernel.org, linux-acpi@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 02/13] ACPI: EC: Abort address space access upon error Date: Mon, 17 Jun 2024 09:26:51 -0400 Message-ID: <20240617132710.2590101-2-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240617132710.2590101-1-sashal@kernel.org> References: <20240617132710.2590101-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.10.219 Content-Transfer-Encoding: 8bit From: Armin Wolf [ Upstream commit f6f172dc6a6d7775b2df6adfd1350700e9a847ec ] When a multi-byte address space access is requested, acpi_ec_read()/ acpi_ec_write() is being called multiple times. Abort such operations if a single call to acpi_ec_read() / acpi_ec_write() fails, as the data read from / written to the EC might be incomplete. Signed-off-by: Armin Wolf Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/acpi/ec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 487884420fb0d..60f49ee161479 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -1316,10 +1316,13 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address, if (ec->busy_polling || bits > 8) acpi_ec_burst_enable(ec); - for (i = 0; i < bytes; ++i, ++address, ++value) + for (i = 0; i < bytes; ++i, ++address, ++value) { result = (function == ACPI_READ) ? acpi_ec_read(ec, address, value) : acpi_ec_write(ec, address, *value); + if (result < 0) + break; + } if (ec->busy_polling || bits > 8) acpi_ec_burst_disable(ec); -- 2.43.0