Skip to content

Commit efea042

Browse files
brauneropsiff
authored andcommitted
eventpoll: drop vestigial __ prefix from ep_remove_{file,epi}()
mainline inclusion from mainline-v7.1-rc1 category: bugfix CVE: CVE-2026-46242 With __ep_remove() gone, the double-underscore on __ep_remove_file() and __ep_remove_epi() no longer contrasts with a __-less parent and just reads as noise. Rename both to ep_remove_file() and ep_remove_epi(). No functional change. Signed-off-by: Christian Brauner (Amutable) <brauner@kernel.org> (cherry picked from commit 0feaf644f7180c4a91b6b405a881afbfd958f1cf) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
1 parent 1e98ca3 commit efea042

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

fs/eventpoll.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,7 @@ static void ep_free(struct eventpoll *ep)
718718
* Called with &file->f_lock held,
719719
* returns with it released
720720
*/
721-
static void __ep_remove_file(struct eventpoll *ep, struct epitem *epi,
721+
static void ep_remove_file(struct eventpoll *ep, struct epitem *epi,
722722
struct file *file)
723723
{
724724
struct epitems_head *to_free = NULL;
@@ -742,7 +742,7 @@ static void __ep_remove_file(struct eventpoll *ep, struct epitem *epi,
742742
free_ephead(to_free);
743743
}
744744

745-
static bool __ep_remove_epi(struct eventpoll *ep, struct epitem *epi)
745+
static bool ep_remove_epi(struct eventpoll *ep, struct epitem *epi)
746746
{
747747
lockdep_assert_held(&ep->mtx);
748748

@@ -788,9 +788,9 @@ static void ep_remove_safe(struct eventpoll *ep, struct epitem *epi)
788788
spin_unlock(&file->f_lock);
789789
return;
790790
}
791-
__ep_remove_file(ep, epi, file);
791+
ep_remove_file(ep, epi, file);
792792

793-
if (__ep_remove_epi(ep, epi))
793+
if (ep_remove_epi(ep, epi))
794794
WARN_ON_ONCE(ep_refcount_dec_and_test(ep));
795795
}
796796

@@ -1012,8 +1012,8 @@ void eventpoll_release_file(struct file *file)
10121012
ep_unregister_pollwait(ep, epi);
10131013

10141014
spin_lock(&file->f_lock);
1015-
__ep_remove_file(ep, epi, file);
1016-
dispose = __ep_remove_epi(ep, epi);
1015+
ep_remove_file(ep, epi, file);
1016+
dispose = ep_remove_epi(ep, epi);
10171017

10181018
mutex_unlock(&ep->mtx);
10191019

0 commit comments

Comments
 (0)