Skip to content

Commit 675f8a7

Browse files
Tzung-Bi Shihgregkh
Tzung-Bi Shih
authored andcommitted
platform/chrome: cros_ec_debugfs: detach log reader wq from devm
[ Upstream commit 0e8eb5e ] Debugfs console_log uses devm memory (e.g. debug_info in cros_ec_console_log_poll()). However, lifecycles of device and debugfs are independent. An use-after-free issue is observed if userland program operates the debugfs after the memory has been freed. The call trace: do_raw_spin_lock _raw_spin_lock_irqsave remove_wait_queue ep_unregister_pollwait ep_remove do_epoll_ctl A Python example to reproduce the issue: ... import select ... p = select.epoll() ... f = open('/sys/kernel/debug/cros_scp/console_log') ... p.register(f, select.POLLIN) ... p.poll(1) [(4, 1)] # 4=fd, 1=select.POLLIN [ shutdown cros_scp at the point ] ... p.poll(1) [(4, 16)] # 4=fd, 16=select.POLLHUP ... p.unregister(f) An use-after-free issue raises here. It called epoll_ctl with EPOLL_CTL_DEL which in turn to use the workqueue in the devm (i.e. log_wq). Detaches log reader's workqueue from devm to make sure it is persistent even if the device has been removed. Signed-off-by: Tzung-Bi Shih <[email protected]> Reviewed-by: Guenter Roeck <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Benson Leung <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent eb3c8d6 commit 675f8a7

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/platform/chrome/cros_ec_debugfs.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525

2626
#define CIRC_ADD(idx, size, value) (((idx) + (value)) & ((size) - 1))
2727

28+
/* waitqueue for log readers */
29+
static DECLARE_WAIT_QUEUE_HEAD(cros_ec_debugfs_log_wq);
30+
2831
/**
2932
* struct cros_ec_debugfs - EC debugging information.
3033
*
@@ -33,7 +36,6 @@
3336
* @log_buffer: circular buffer for console log information
3437
* @read_msg: preallocated EC command and buffer to read console log
3538
* @log_mutex: mutex to protect circular buffer
36-
* @log_wq: waitqueue for log readers
3739
* @log_poll_work: recurring task to poll EC for new console log data
3840
* @panicinfo_blob: panicinfo debugfs blob
3941
*/
@@ -44,7 +46,6 @@ struct cros_ec_debugfs {
4446
struct circ_buf log_buffer;
4547
struct cros_ec_command *read_msg;
4648
struct mutex log_mutex;
47-
wait_queue_head_t log_wq;
4849
struct delayed_work log_poll_work;
4950
/* EC panicinfo */
5051
struct debugfs_blob_wrapper panicinfo_blob;
@@ -107,7 +108,7 @@ static void cros_ec_console_log_work(struct work_struct *__work)
107108
buf_space--;
108109
}
109110

110-
wake_up(&debug_info->log_wq);
111+
wake_up(&cros_ec_debugfs_log_wq);
111112
}
112113

113114
mutex_unlock(&debug_info->log_mutex);
@@ -141,7 +142,7 @@ static ssize_t cros_ec_console_log_read(struct file *file, char __user *buf,
141142

142143
mutex_unlock(&debug_info->log_mutex);
143144

144-
ret = wait_event_interruptible(debug_info->log_wq,
145+
ret = wait_event_interruptible(cros_ec_debugfs_log_wq,
145146
CIRC_CNT(cb->head, cb->tail, LOG_SIZE));
146147
if (ret < 0)
147148
return ret;
@@ -173,7 +174,7 @@ static __poll_t cros_ec_console_log_poll(struct file *file,
173174
struct cros_ec_debugfs *debug_info = file->private_data;
174175
__poll_t mask = 0;
175176

176-
poll_wait(file, &debug_info->log_wq, wait);
177+
poll_wait(file, &cros_ec_debugfs_log_wq, wait);
177178

178179
mutex_lock(&debug_info->log_mutex);
179180
if (CIRC_CNT(debug_info->log_buffer.head,
@@ -377,7 +378,6 @@ static int cros_ec_create_console_log(struct cros_ec_debugfs *debug_info)
377378
debug_info->log_buffer.tail = 0;
378379

379380
mutex_init(&debug_info->log_mutex);
380-
init_waitqueue_head(&debug_info->log_wq);
381381

382382
debugfs_create_file("console_log", S_IFREG | 0444, debug_info->dir,
383383
debug_info, &cros_ec_console_log_fops);

0 commit comments

Comments
 (0)