Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

power: supply: sbs-battery: Fix use-after-free in power_supply_changed()

Using the `devm_` variant for requesting IRQ _before_ the `devm_`
variant for allocating/registering the `power_supply` handle, means that
the `power_supply` handle will be deallocated/unregistered _before_ the
interrupt handler (since `devm_` naturally deallocates in reverse
allocation order). This means that during removal, there is a race
condition where an interrupt can fire just _after_ the `power_supply`
handle has been freed, *but* just _before_ the corresponding
unregistration of the IRQ handler has run.

This will lead to the IRQ handler calling `power_supply_changed()` with
a freed `power_supply` handle. Which usually crashes the system or
otherwise silently corrupts the memory...

Note that there is a similar situation which can also happen during
`probe()`; the possibility of an interrupt firing _before_ registering
the `power_supply` handle. This would then lead to the nasty situation
of using the `power_supply` handle *uninitialized* in
`power_supply_changed()`.

Fix this racy use-after-free by making sure the IRQ is requested _after_
the registration of the `power_supply` handle. Keep the old behavior of
just printing a warning in case of any failures during the IRQ request
and finishing the probe successfully.

Fixes: d2cec82c2880 ("power: sbs-battery: Request threaded irq and fix dev callback cookie")
Signed-off-by: Waqar Hameed <waqar.hameed@axis.com>
Reviewed-by: Phil Reid <preid@electromag.com.au>
Link: https://patch.msgid.link/0ef896e002495e615157b482d18a437af19ddcd0.1766268280.git.waqar.hameed@axis.com
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

authored by

Waqar Hameed and committed by
Sebastian Reichel
8d59cf38 e2febe37

+18 -18
+18 -18
drivers/power/supply/sbs-battery.c
··· 1174 1174 1175 1175 i2c_set_clientdata(client, chip); 1176 1176 1177 - if (!chip->gpio_detect) 1178 - goto skip_gpio; 1179 - 1180 - irq = gpiod_to_irq(chip->gpio_detect); 1181 - if (irq <= 0) { 1182 - dev_warn(&client->dev, "Failed to get gpio as irq: %d\n", irq); 1183 - goto skip_gpio; 1184 - } 1185 - 1186 - rc = devm_request_threaded_irq(&client->dev, irq, NULL, sbs_irq, 1187 - IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_ONESHOT, 1188 - dev_name(&client->dev), chip); 1189 - if (rc) { 1190 - dev_warn(&client->dev, "Failed to request irq: %d\n", rc); 1191 - goto skip_gpio; 1192 - } 1193 - 1194 - skip_gpio: 1195 1177 /* 1196 1178 * Before we register, we might need to make sure we can actually talk 1197 1179 * to the battery. ··· 1199 1217 return dev_err_probe(&client->dev, PTR_ERR(chip->power_supply), 1200 1218 "Failed to register power supply\n"); 1201 1219 1220 + if (!chip->gpio_detect) 1221 + goto out; 1222 + 1223 + irq = gpiod_to_irq(chip->gpio_detect); 1224 + if (irq <= 0) { 1225 + dev_warn(&client->dev, "Failed to get gpio as irq: %d\n", irq); 1226 + goto out; 1227 + } 1228 + 1229 + rc = devm_request_threaded_irq(&client->dev, irq, NULL, sbs_irq, 1230 + IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_ONESHOT, 1231 + dev_name(&client->dev), chip); 1232 + if (rc) { 1233 + dev_warn(&client->dev, "Failed to request irq: %d\n", rc); 1234 + goto out; 1235 + } 1236 + 1237 + out: 1202 1238 dev_info(&client->dev, 1203 1239 "%s: battery gas gauge device registered\n", client->name); 1204 1240