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 1AAA731F9A2; Thu, 2 Jul 2026 16:48:20 +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=1783010901; cv=none; b=FkYqypA9cfNxEXp608oa94I+5+RRlfrpA5wB/8FBOKqwGpT/an+INzUY9/YorlhEvc40gynRApaDoHZvz6nQPpvkYIUkwyKnKOhmZkuWiRi8evpZGvDulXJF5VBvj4dm2dRMmF+CBpZFu6ZA4BLw/vHOjGWcyhwx012DtJsg3vo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783010901; c=relaxed/simple; bh=4Cm4zyBWbVuTNAD7/+KJ1ELlNccS9CXH9hGkZ51gv1w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sOI7KpJ+ysIAO0rO/YzLe/80dNJ2hDGKBcGZLDdJ36Ver1APL2Ffr7BswUCE50Dx1wBh9ojKyyrhOvo5ae43EecBtZJVXGYLstQb5JyF+lnKDGrjvzxnp9ye7YykqVRJumU3kqdbQvUjF7Xoahj64zFdFLWpdhQ2emKsgmbViRw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Rq2el2Kf; 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="Rq2el2Kf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7B3AD1F000E9; Thu, 2 Jul 2026 16:48:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1783010900; bh=8iA+l0j7sy1pmzlacabtN0BwV6fWTCEoCrLSN9UaqDc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Rq2el2KfZfmHe/d4fQIs2Uw0+8TTcDpXv5m8kagCPPUUP+FXFqED/W+KBQIgpB/34 3TJHs1KspuxQpbfEZ3gDFZeYtNVXg9xQpEPOgtTyHNThUtda/srzMocT0e8DiPb9fn +pmSXycrra8xxH7EC8ocfBM/uNSnAgm0OtfQPX78= 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.6 079/175] eventpoll: drop vestigial __ prefix from ep_remove_{file,epi}() Date: Thu, 2 Jul 2026 18:19:40 +0200 Message-ID: <20260702155117.449992773@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260702155115.766838875@linuxfoundation.org> References: <20260702155115.766838875@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.6-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 766716c2fd92a0..0a54a42263575f 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -719,7 +719,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; @@ -743,7 +743,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); @@ -789,9 +789,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)); } @@ -1013,8 +1013,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