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 BBCA31E4B0; Tue, 14 May 2024 11:47:07 +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=1715687227; cv=none; b=NtJwyE80k2g11cSdvZJXUSGGh/P7P0fLIenzsr3JjnSjNNxfAqk6gZ0izmeQlrCYSHnFMCg78Xr9HuOOOMMIzULmnWrYwd9Rwjy2sCLedCGHF1zEvZdNp++Z7lcTJN2tam2N+kMveF+QpTy7duHirArIw6lFFLJKPt7jdhAirfw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715687227; c=relaxed/simple; bh=WXr6jMSl8LaMLli3C/rHHlK2bPYFAdNmxuqXzLbyXWs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jGUpJkYOIovXmyDAh6aIjnfrI/B8ZedaJyo4ijcn7uW4RhjyTIJsy7enTO9MCt44yGai9yIKTgC5aRgiWFiYuE3+Nkm6g0djoVSyzggfZU6MWFYYqSeQp4liXPMdx77pQdDWJEtavAf1P0VWE+Wg8jWzpX/ASj6LazxdHAm6OYA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=RQyyncLe; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="RQyyncLe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 40BEEC2BD10; Tue, 14 May 2024 11:47:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1715687227; bh=WXr6jMSl8LaMLli3C/rHHlK2bPYFAdNmxuqXzLbyXWs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RQyyncLeUnufJ5zFEqR+IgdOCo+WGPAnin1sTGUcmpWYZvf1Bli9IPJjw4gqtT3di gmnd4V8VmZ+aNZHpPmUxWOvz8K8gSTo8E9rU3DddDhFhPxnDwTUYHnAwdiB0Ir5hKy IMjnmWp/dQCTECl/bJLkbjQ9c4MQSWdSTyqG1u8U= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Daniel Okazaki , Bartosz Golaszewski , Sasha Levin Subject: [PATCH 5.10 006/111] eeprom: at24: fix memory corruption race condition Date: Tue, 14 May 2024 12:19:04 +0200 Message-ID: <20240514100957.364191611@linuxfoundation.org> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240514100957.114746054@linuxfoundation.org> References: <20240514100957.114746054@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Daniel Okazaki [ Upstream commit f42c97027fb75776e2e9358d16bf4a99aeb04cf2 ] If the eeprom is not accessible, an nvmem device will be registered, the read will fail, and the device will be torn down. If another driver accesses the nvmem device after the teardown, it will reference invalid memory. Move the failure point before registering the nvmem device. Signed-off-by: Daniel Okazaki Fixes: b20eb4c1f026 ("eeprom: at24: drop unnecessary label") Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20240422174337.2487142-1-dtokazaki@google.com Signed-off-by: Bartosz Golaszewski Signed-off-by: Sasha Levin --- drivers/misc/eeprom/at24.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c index 65a7517c031a7..02bea44369435 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -782,15 +782,6 @@ static int at24_probe(struct i2c_client *client) pm_runtime_set_active(dev); pm_runtime_enable(dev); - at24->nvmem = devm_nvmem_register(dev, &nvmem_config); - if (IS_ERR(at24->nvmem)) { - pm_runtime_disable(dev); - if (!pm_runtime_status_suspended(dev)) - regulator_disable(at24->vcc_reg); - return dev_err_probe(dev, PTR_ERR(at24->nvmem), - "failed to register nvmem\n"); - } - /* * Perform a one-byte test read to verify that the * chip is functional. @@ -803,6 +794,15 @@ static int at24_probe(struct i2c_client *client) return -ENODEV; } + at24->nvmem = devm_nvmem_register(dev, &nvmem_config); + if (IS_ERR(at24->nvmem)) { + pm_runtime_disable(dev); + if (!pm_runtime_status_suspended(dev)) + regulator_disable(at24->vcc_reg); + return dev_err_probe(dev, PTR_ERR(at24->nvmem), + "failed to register nvmem\n"); + } + /* If this a SPD EEPROM, probe for DDR3 thermal sensor */ if (cdata == &at24_data_spd) at24_probe_temp_sensor(client); -- 2.43.0