Skip to contentSkip to conversation

kernfs: fix deadlock in epoll_ctl by waking pollfree

PATCH In review Sainath Manda 2 participants 2 messages Jun 21 – Jul 17

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

PATCH v2 1/1 kernfs: fix deadlock in epoll_ctl by waking pollfree

Syzbot reported a task hung in do_epoll_ctl_file(). This is caused by an AB-BA lock inversion between epoll's ep->mtx and kernfs node teardown.

Thread A (epoll_ctl) acquires ep->mtx, then attempts to acquire the kernfs active reference during vfs_poll().
Thread B (kernfs_remove) deactivates the node and attempts to unhook active epoll monitors, which requires ep->mtx.

This patch fixes the deadlock by utilizing the existing epoll POLLFREE path. By calling wake_up_pollfree(&on->poll) before the waitqueue is freed, epoll users are notified to detach their wait entries without requiring kernfs teardown to acquire ep->mtx.

---
 fs/kernfs/file.c | 8 ++++++++
 1 file changed, 8 insertions(+)
fs/kernfs/file.c +8 -0
index 1163aa769..db3fed4d7 100644
@@ -600,6 +600,14 @@ static void kernfs_unlink_open_file(struct kernfs_node *kn,
 	}
 
 	if (list_empty(&on->files)) {
+		/*
+		 * @on->poll is embedded in @on and is about to be freed.  Tell
+		 * epoll users to detach their wait entries through the POLLFREE
+		 * callback path before the waitqueue disappears.  This path is
+		 * serialized by the waitqueue lock and doesn't require taking
+		 * eventpoll's ep->mtx from kernfs teardown.
+		 */
+		wake_up_pollfree(&on->poll);
 		rcu_assign_pointer(kn->attr.open, NULL);
 		kfree_rcu(on, rcu_head);
 	}
Signature · 1 line
2.34.1
maintainer
#1 lore raw
Quoted 13 lines · Sainath Manda

Syzbot reported a task hung in do_epoll_ctl_file(). This is caused by an AB-BA lock inversion between epoll's ep->mtx and kernfs node teardown.

Thread A (epoll_ctl) acquires ep->mtx, then attempts to acquire the kernfs active reference during vfs_poll().
Thread B (kernfs_remove) deactivates the node and attempts to unhook active epoll monitors, which requires ep->mtx.

This patch fixes the deadlock by utilizing the existing epoll POLLFREE path. By calling wake_up_pollfree(&on->poll) before the waitqueue is freed, epoll users are notified to detach their wait entries without requiring kernfs teardown to acquire ep->mtx.

Quoted 5 lines
---
 fs/kernfs/file.c | 8 ++++++++
 1 file changed, 8 insertions(+)

What commit id does this fix? And why isn't it for stable kernels too?

thanks,

greg k-h