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 B658F51FCC6; Wed, 30 Sep 2026 18:24:55 +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=1790792696; cv=none; b=o8o3cCQQ3RgxEGE4sR5JPix3PBuwEiWnYA9Hp/KwQcVY6ndVbJLzzYNMEPa6AZRYazWiYz3ywIigFzTLRMa4Z7AmmtbeWSlL9flECuhrnxs1H6OnMBZCFf8v9QjPK/PUjXvwPFvz0ovQy7g63sUl1Umdi++EvBFqqooLzxMbUdQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790792696; c=relaxed/simple; bh=zg++KM1f7D0nbPulcu0ApBzAP37g/ISjUW9vzvCjjwI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=F42tZOYw3zQ1I7ItDyZO4tR/hNKYz0VkD30OyTi2ZlV5cELUxJW2WEkBI0vmVKZM2LfdNBb3oYUszCDdKifNMd/z+pOXVDsLu6EbXh4exIHlfdIevfB9FmAmO1bDknVsCHmEIHgu4va6EV4pM/3YFGDRtD7KIyoIUNh0msBlkCo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=bqoKEWFl; 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="bqoKEWFl" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1C8B21F000FF; Wed, 30 Sep 2026 18:24:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790792695; bh=/awqM0fenOStdhNUem6w0Zc10uReeVYTN6hh0ojC2WM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bqoKEWFlljAfySTgGDQWggZiQLSxAj2ovxG9ZNWkbg8GC6sHaFvYqq7xDWhg9E0w8 F77BrHCywR/ErP07rsMbPXpofwZOYuhxldTP2IHc9SxlbQW79S5AxGmB0lBnr5Ogdi nJshucIgsq0A+bZOXnhcovVK7kyg5vcGXuBrA5ZY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Christian Brauner (Amutable)" , Quentin Schulz , Wentao Guan , Lee Jones , Sasha Levin Subject: [PATCH 5.15 744/752] eventpoll: drop vestigial __ prefix from ep_remove_{file,epi}() Date: Wed, 30 Sep 2026 17:30:14 +0200 Message-ID: <20260930152414.316481825@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930152358.131179731@linuxfoundation.org> References: <20260930152358.131179731@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 5.15-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: Wentao Guan Signed-off-by: Greg Kroah-Hartman (cherry picked from commit e40f6d02a75baa0f145e0394a2d9b31b969da247) Signed-off-by: Lee Jones 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 365d833bae20c..e666eccbde827 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -712,7 +712,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; @@ -736,7 +736,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); @@ -782,9 +782,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)); } @@ -1006,8 +1006,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