Skip to content

Commit 12f65d1

Browse files
lkpdnBartosz Golaszewski
authored and
Bartosz Golaszewski
committedMar 5, 2025
gpio: aggregator: protect driver attr handlers against module unload
Both new_device_store and delete_device_store touch module global resources (e.g. gpio_aggregator_lock). To prevent race conditions with module unload, a reference needs to be held. Add try_module_get() in these handlers. For new_device_store, this eliminates what appears to be the most dangerous scenario: if an id is allocated from gpio_aggregator_idr but platform_device_register has not yet been called or completed, a concurrent module unload could fail to unregister/delete the device, leaving behind a dangling platform device/GPIO forwarder. This can result in various issues. The following simple reproducer demonstrates these problems: #!/bin/bash while :; do # note: whether 'gpiochip0 0' exists or not does not matter. echo 'gpiochip0 0' > /sys/bus/platform/drivers/gpio-aggregator/new_device done & while :; do modprobe gpio-aggregator modprobe -r gpio-aggregator done & wait Starting with the following warning, several kinds of warnings will appear and the system may become unstable: ------------[ cut here ]------------ list_del corruption, ffff888103e2e980->next is LIST_POISON1 (dead000000000100) WARNING: CPU: 1 PID: 1327 at lib/list_debug.c:56 __list_del_entry_valid_or_report+0xa3/0x120 [...] RIP: 0010:__list_del_entry_valid_or_report+0xa3/0x120 [...] Call Trace: <TASK> ? __list_del_entry_valid_or_report+0xa3/0x120 ? __warn.cold+0x93/0xf2 ? __list_del_entry_valid_or_report+0xa3/0x120 ? report_bug+0xe6/0x170 ? __irq_work_queue_local+0x39/0xe0 ? handle_bug+0x58/0x90 ? exc_invalid_op+0x13/0x60 ? asm_exc_invalid_op+0x16/0x20 ? __list_del_entry_valid_or_report+0xa3/0x120 gpiod_remove_lookup_table+0x22/0x60 new_device_store+0x315/0x350 [gpio_aggregator] kernfs_fop_write_iter+0x137/0x1f0 vfs_write+0x262/0x430 ksys_write+0x60/0xd0 do_syscall_64+0x6c/0x180 entry_SYSCALL_64_after_hwframe+0x76/0x7e [...] </TASK> ---[ end trace 0000000000000000 ]--- Fixes: 828546e ("gpio: Add GPIO Aggregator") Cc: stable@vger.kernel.org Signed-off-by: Koichiro Den <koichiro.den@canonical.com> Link: https://lore.kernel.org/r/20250224143134.3024598-2-koichiro.den@canonical.com Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
1 parent 7eb1721 commit 12f65d1

File tree

1 file changed

+17
-3
lines changed

1 file changed

+17
-3
lines changed
 

‎drivers/gpio/gpio-aggregator.c

+17-3
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,15 @@ static ssize_t new_device_store(struct device_driver *driver, const char *buf,
119119
struct platform_device *pdev;
120120
int res, id;
121121

122+
if (!try_module_get(THIS_MODULE))
123+
return -ENOENT;
124+
122125
/* kernfs guarantees string termination, so count + 1 is safe */
123126
aggr = kzalloc(sizeof(*aggr) + count + 1, GFP_KERNEL);
124-
if (!aggr)
125-
return -ENOMEM;
127+
if (!aggr) {
128+
res = -ENOMEM;
129+
goto put_module;
130+
}
126131

127132
memcpy(aggr->args, buf, count + 1);
128133

@@ -161,6 +166,7 @@ static ssize_t new_device_store(struct device_driver *driver, const char *buf,
161166
}
162167

163168
aggr->pdev = pdev;
169+
module_put(THIS_MODULE);
164170
return count;
165171

166172
remove_table:
@@ -175,6 +181,8 @@ static ssize_t new_device_store(struct device_driver *driver, const char *buf,
175181
kfree(aggr->lookups);
176182
free_ga:
177183
kfree(aggr);
184+
put_module:
185+
module_put(THIS_MODULE);
178186
return res;
179187
}
180188

@@ -203,13 +211,19 @@ static ssize_t delete_device_store(struct device_driver *driver,
203211
if (error)
204212
return error;
205213

214+
if (!try_module_get(THIS_MODULE))
215+
return -ENOENT;
216+
206217
mutex_lock(&gpio_aggregator_lock);
207218
aggr = idr_remove(&gpio_aggregator_idr, id);
208219
mutex_unlock(&gpio_aggregator_lock);
209-
if (!aggr)
220+
if (!aggr) {
221+
module_put(THIS_MODULE);
210222
return -ENOENT;
223+
}
211224

212225
gpio_aggregator_free(aggr);
226+
module_put(THIS_MODULE);
213227
return count;
214228
}
215229
static DRIVER_ATTR_WO(delete_device);

0 commit comments

Comments
 (0)
Please sign in to comment.