Skip to contentSkip to conversation

eeprom: at24: fix memory corruption race condition

PATCH Applied Daniel Okazaki 4 participants 6 messages Apr 22, 2024 – Apr 23, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 eeprom: at24: fix memory corruption race condition

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.

Fixes b20eb4c1f026 ("eeprom: at24: drop unnecessary label")

---
Changed sha length to 12 in description

---
 drivers/misc/eeprom/at24.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/misc/eeprom/at24.c +9 -9
index 572333ead5fb..4bd4f32bcdab 100644
@@ -758,15 +758,6 @@ static int at24_probe(struct i2c_client *client)
 	}
 	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,
 	 * unless powering on the device is to be avoided during probe (i.e.
@@ -782,6 +773,15 @@ static int at24_probe(struct i2c_client *client)
 		}
 	}
 
+	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);
Signature · 1 line
2.44.0.769.g3c40516874-goog
#1 lore raw
Quoted 5 lines · Daniel Okazaki

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.

Quoted 7 lines

Move the failure point before registering the nvmem device.

Fixes b20eb4c1f026 ("eeprom: at24: drop unnecessary label")

---
Changed sha length to 12 in description
---

Hi,

This is the friendly patch-bot of Greg Kroah-Hartman. You have sent him a patch that has triggered this response. He used to manually respond to these common problems, but in order to save his sanity (he kept writing the same thing over and over, yet to different people), I was created. Hopefully you will not take offence and will fix the problem in your patch and resubmit it so that it can be accepted into the Linux kernel tree.

You are receiving this message because of the following common error(s) as indicated below:

- You have marked a patch with a "Fixes:" tag for a commit that is in an older released kernel, yet you do not have a cc: stable line in the signed-off-by area at all, which means that the patch will not be applied to any older kernel releases. To properly fix this, please follow the documented rules in the Documentation/process/stable-kernel-rules.rst file for how to resolve this.

If you wish to discuss this problem further, or you have questions about how to resolve this issue, please feel free to respond to this email and Greg will reply once he has dug out from the pending patches received from other developers.

thanks,

greg k-h's patch email bot

#2 lore raw
Quoted 28 lines · Greg Kroah-Hartman
Quoted 5 lines · Daniel Okazaki

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.

Quoted 7 lines

Move the failure point before registering the nvmem device.

Fixes b20eb4c1f026 ("eeprom: at24: drop unnecessary label")

---
Changed sha length to 12 in description
---

Hi,

This is the friendly patch-bot of Greg Kroah-Hartman. You have sent him a patch that has triggered this response. He used to manually respond to these common problems, but in order to save his sanity (he kept writing the same thing over and over, yet to different people), I was created. Hopefully you will not take offence and will fix the problem in your patch and resubmit it so that it can be accepted into the Linux kernel tree.

You are receiving this message because of the following common error(s) as indicated below:

Quoted 7 lines

- You have marked a patch with a "Fixes:" tag for a commit that is in an older released kernel, yet you do not have a cc: stable line in the signed-off-by area at all, which means that the patch will not be applied to any older kernel releases. To properly fix this, please follow the documented rules in the Documentation/process/stable-kernel-rules.rst file for how to resolve this.

I fixed it when applying.

Bart

Quoted 9 lines

If you wish to discuss this problem further, or you have questions about how to resolve this issue, please feel free to respond to this email and Greg will reply once he has dug out from the pending patches received from other developers.

thanks,

greg k-h's patch email bot

#3 lore raw
In reply to Daniel Okazaki

How do you think about to increase the version number for your attempt in the patch subject?

See also previous contribution:
https://lore.kernel.org/lkml/[email protected]/
https://lkml.org/lkml/2024/4/19/946

Quoted 2 lines

If the eeprom is not accessible, an nvmem device will be registered, the read will fail, and the device will be torn down.

…

Please present the introduction for failure conditions as an enumeration.

Quoted 1 line

Move the failure point before registering the nvmem device.

…

I would interpret the diff data more in the way that a devm_nvmem_register() call should be performed a bit later in the implementation of the function “at24_probe”. How do you think about to mention the affected function also in the summary phrase?

Quoted 1 line

Changed sha length to 12 in description

A specification was adjusted for a tag. Please add a version identifier here.
Will version descriptions be extended another bit?

Quoted 1 line

---

I suggest to use blank line instead of a duplicate marker line.

Regards,
Markus

#4 lore raw
In reply to Daniel Okazaki
Quoted 11 lines · Daniel Okazaki

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.

Fixes b20eb4c1f026 ("eeprom: at24: drop unnecessary label")

---

I will take this patch because it does make sense but for the record:
this doesn't fully fix the issue with the nvmem race when tearing down the device.

Bart

#5 lore raw
In reply to Daniel Okazaki

From: Bartosz Golaszewski <[email protected]>

Quoted 8 lines · Daniel Okazaki

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.

[...]

Applied, thanks!

[1/1] eeprom: at24: fix memory corruption race condition

      commit: f42c97027fb75776e2e9358d16bf4a99aeb04cf2

Best regards,

Signature · 1 line
Bartosz Golaszewski <[email protected]>