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 3D60A1AC44B; Tue, 18 Jun 2024 12:41:47 +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=1718714508; cv=none; b=tq3XlL8JE1NZlxnHUQKumOEZDUg/gehELl1mkK3tuWnIoAcqlQjr9jitr3qeRZkutiNpvafA19qyvW3PVsstKKKyap5oqGp3RYbNCTYf9B1yqxbDbtrUwurmb9kgon6Unyjh37BuIZFeJRdBQLMw//CItFU/LHO2kUNCZp2FCSE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718714508; c=relaxed/simple; bh=YIOi+92waFQ1ce33g6Wg62+s1ohyWKkoSuGKxK+hrF0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bmBikONfHwlwfFz8jZYoJin2A6Eb9Onvy7/Mg1LGCrFGUcUC9aL0ixYsURlTj53xXbdd0pVlUYFEQYEkRhtL8bkoQjRmLKK9UQdnsokmnSf9U+hB+9j8n518ye83UASxlR3O9TCULyKwrIvIapmcBZ8r7vr9BWairFBThkdy4U8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DnTV2h3L; 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="DnTV2h3L" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 09976C3277B; Tue, 18 Jun 2024 12:41:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1718714507; bh=YIOi+92waFQ1ce33g6Wg62+s1ohyWKkoSuGKxK+hrF0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DnTV2h3LKmUkSPJtTZlfmr3fJhcjKx1Qk3qMKpNna91KndAME360z4Lwzv0FpLouz n8lK509uc01AL0J7ATFAv4NEQ4+fhX7Dk38DmpsoQeP9eHVdgp9lv/pfrOWk+uwhUQ +OupHXq7OBIeMgbHGPNcE209nP2qj3KPlbZ92UpZDlj1xnJ2MJpmchPAFUtPfeAKtZ ZP73uPYYjS9fhStzIqp1hd4Ck0rsWQLs8kdFA7s3LziHfoiWd4nyU12V9pH1lQD4J9 ykHMqBKuSz9loo6hFAjNzGVhxr9oFHxTbkSiy3wg80+PyLGCG/fYlOa5Tr4jdvmbVN AQF6PeUdR+Eng== 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.15 05/21] ACPI: EC: Abort address space access upon error Date: Tue, 18 Jun 2024 08:41:04 -0400 Message-ID: <20240618124139.3303801-5-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240618124139.3303801-1-sashal@kernel.org> References: <20240618124139.3303801-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.15.161 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 472418a0e0cab..1896ec78e88c7 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -1303,10 +1303,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