Skip to content

Commit 6523c6c

Browse files
brauneropsiff
authored andcommitted
eventpoll: fix ep_remove struct eventpoll / struct file UAF
mainline inclusion from mainline-v7.1-rc1 category: bugfix CVE: CVE-2026-46242 ep_remove() (via ep_remove_file()) cleared file->f_ep under file->f_lock but then kept using @file inside the critical section (is_file_epoll(), hlist_del_rcu() through the head, spin_unlock). A concurrent __fput() taking the eventpoll_release() fastpath in that window observed the transient NULL, skipped eventpoll_release_file() and ran to f_op->release / file_free(). For the epoll-watches-epoll case, f_op->release is ep_eventpoll_release() -> ep_clear_and_put() -> ep_free(), which kfree()s the watched struct eventpoll. Its embedded ->refs hlist_head is exactly where epi->fllink.pprev points, so the subsequent hlist_del_rcu()'s "*pprev = next" scribbles into freed kmalloc-192 memory. In addition, struct file is SLAB_TYPESAFE_BY_RCU, so the slot backing @file could be recycled by alloc_empty_file() -- reinitializing f_lock and f_ep -- while ep_remove() is still nominally inside that lock. The upshot is an attacker-controllable kmem_cache_free() against the wrong slab cache. Pin @file via epi_fget() at the top of ep_remove() and gate the critical section on the pin succeeding. With the pin held @file cannot reach refcount zero, which holds __fput() off and transitively keeps the watched struct eventpoll alive across the hlist_del_rcu() and the f_lock use, closing both UAFs. If the pin fails @file has already reached refcount zero and its __fput() is in flight. Because we bailed before clearing f_ep, that path takes the eventpoll_release() slow path into eventpoll_release_file() and blocks on ep->mtx until the waiter side's ep_clear_and_put() drops it. The bailed epi's share of ep->refcount stays intact, so the trailing ep_refcount_dec_and_test() in ep_clear_and_put() cannot free the eventpoll out from under eventpoll_release_file(); the orphaned epi is then cleaned up there. A successful pin also proves we are not racing eventpoll_release_file() on this epi, so drop the now-redundant re-check of epi->dying under f_lock. The cheap lockless READ_ONCE(epi->dying) fast-path bailout stays. Fixes: 58c9b01 ("epoll: use refcount to reduce ep_mutex contention") Reported-by: Jaeyoung Chung <jjy600901@snu.ac.kr> Link: https://patch.msgid.link/20260423-work-epoll-uaf-v1-6-2470f9eec0f5@kernel.org Signed-off-by: Christian Brauner (Amutable) <brauner@kernel.org> [fs/eventpoll.c:803:9: error: cleanup argument not a function, so call fput instead] (cherry picked from commit a6dc643c69311677c574a0f17a3f4d66a5f3744b) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
1 parent 661e814 commit 6523c6c

1 file changed

Lines changed: 12 additions & 6 deletions

File tree

fs/eventpoll.c

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -800,22 +800,26 @@ static bool ep_remove_epi(struct eventpoll *ep, struct epitem *epi)
800800
*/
801801
static void ep_remove(struct eventpoll *ep, struct epitem *epi)
802802
{
803-
struct file *file = epi->ffd.file;
803+
struct file *file = NULL;
804804

805805
lockdep_assert_irqs_enabled();
806806
lockdep_assert_held(&ep->mtx);
807807

808808
ep_unregister_pollwait(ep, epi);
809809

810-
/* sync with eventpoll_release_file() */
810+
/* cheap sync with eventpoll_release_file() */
811811
if (unlikely(READ_ONCE(epi->dying)))
812812
return;
813813

814-
spin_lock(&file->f_lock);
815-
if (epi->dying) {
816-
spin_unlock(&file->f_lock);
814+
/*
815+
* If we manage to grab a reference it means we're not in
816+
* eventpoll_release_file() and aren't going to be.
817+
*/
818+
file = epi_fget(epi);
819+
if (!file)
817820
return;
818-
}
821+
822+
spin_lock(&file->f_lock);
819823
ep_remove_file(ep, epi, file);
820824

821825
if (ep_remove_epi(ep, epi))
@@ -861,6 +865,8 @@ static void ep_clear_and_put(struct eventpoll *ep)
861865
mutex_unlock(&ep->mtx);
862866
if (ep_refcount_dec_and_test(ep))
863867
ep_free(ep);
868+
869+
fput(file);
864870
}
865871

866872
static int ep_eventpoll_release(struct inode *inode, struct file *file)

0 commit comments

Comments
 (0)