From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2E7353358B9; Thu, 2 Jul 2026 16:38:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783010334; cv=none; b=Z6ZD4i2e9xvp4hd3DL4W9K4WYyt7qh8Jut1EwLSRwn1g44Vp2upCSsqiwPGqUZaiV8X1rDfC3mZH2Z3pQZwDSwFUisj1gWmXulolNm1KbMYUcctIa3m0J1PPjzRChT4vKMZgmrBQn3k9JlyDY7hHX/aFDq+e8/c+tw1b8F0gD1U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783010334; c=relaxed/simple; bh=DUanBvpZ1ma7FJ9bX2sSHlG/Yc/VYsjIcl6Pw0I7/Ng=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=V4FmhiHLbtWEaUDtATPTAmfU9CLi6T/uvzmKhpw+V6f3BUB6W67KOIIwslMbuiht7jA0kGcmZrUf/kkrplA5H4dIZ3L3pael24y+S/0KtC1AMYkpQXHjahI+/a/G6ZEJOoXz2Bg33KanmK3lXKhPfsj3hHiCWF4SO0fkGsbj3YY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Rm6Z/UGm; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Rm6Z/UGm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2B84F1F000E9; Thu, 2 Jul 2026 16:38:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1783010332; bh=LBrv8j62KFva5ktkqrgszkpdw/ETv7KdMyIsN1zWM3g=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Rm6Z/UGmaLrbWfkFzCJ4yDehII8gvzWdNTq86J9+QElO0gRNmaWc1NiA9uzNwD6nM j4VjppJZl1P4YQsJCcNq3cW1+2lUaLTviOcqwPxLhhZHKYuKQ05Vbf6Z9iuQU0gR6e x3xOsLSs4cThr+heYOskR+igHu5Wqb+V6ngTX2j8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Christian Brauner (Amutable)" , Quentin Schulz , Sasha Levin Subject: [PATCH 6.12 015/204] eventpoll: drop vestigial __ prefix from ep_remove_{file,epi}() Date: Thu, 2 Jul 2026 18:17:52 +0200 Message-ID: <20260702155118.988675646@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260702155118.667618796@linuxfoundation.org> References: <20260702155118.667618796@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Christian Brauner [ Upstream commit 0feaf644f7180c4a91b6b405a881afbfd958f1cf ] 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) Stable-dep-of: a6dc643c6931 ("eventpoll: fix ep_remove struct eventpoll / struct file UAF") Signed-off-by: Quentin Schulz Signed-off-by: Sasha Levin --- fs/eventpoll.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 3ac8a26c3522f6..dc747f382dd954 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -801,7 +801,7 @@ static void ep_free(struct eventpoll *ep) * Called with &file->f_lock held, * returns with it released */ -static void __ep_remove_file(struct eventpoll *ep, struct epitem *epi, +static void ep_remove_file(struct eventpoll *ep, struct epitem *epi, struct file *file) { struct epitems_head *to_free = NULL; @@ -825,7 +825,7 @@ static void __ep_remove_file(struct eventpoll *ep, struct epitem *epi, free_ephead(to_free); } -static bool __ep_remove_epi(struct eventpoll *ep, struct epitem *epi) +static bool ep_remove_epi(struct eventpoll *ep, struct epitem *epi) { lockdep_assert_held(&ep->mtx); @@ -871,9 +871,9 @@ static void ep_remove_safe(struct eventpoll *ep, struct epitem *epi) spin_unlock(&file->f_lock); return; } - __ep_remove_file(ep, epi, file); + ep_remove_file(ep, epi, file); - if (__ep_remove_epi(ep, epi)) + if (ep_remove_epi(ep, epi)) WARN_ON_ONCE(ep_refcount_dec_and_test(ep)); } @@ -1118,8 +1118,8 @@ void eventpoll_release_file(struct file *file) ep_unregister_pollwait(ep, epi); spin_lock(&file->f_lock); - __ep_remove_file(ep, epi, file); - dispose = __ep_remove_epi(ep, epi); + ep_remove_file(ep, epi, file); + dispose = ep_remove_epi(ep, epi); mutex_unlock(&ep->mtx); -- 2.53.0