From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793822303; b=1N3BK8TgT4nX8Kj7SXJZrV6zHUS2tIFA/yw5NoWe4COly0BpXnhUSYD7UPeHa8+I+KMO j483GYBq5NjdH4i3IyyfRUz/72Xk4PchrZpor0yCTWlcsJnYLYNUVcfAMCY4Bgy8XUdUL V9YWyP3mzEDnK8mbcRc0Td91rTbXwxIU/X4J/DcvK0kfeF7QVnmly1xLmk9eJsQ7jeQyJ u7sR4NSW+kI4iZaqcF9WZl3NIQzQVE/T62rt6kgiL2sfVZYKoNwnEwol7ZyBZh0FF67x4 x6hSVjz74u3i18OBlzw1/dzgGhFQvHEvEtwg1+loRxAhn34EJLJiXrIXDyFSrB5EojQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793822303; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID: In-Reply-To:References:MIME-Version:Content-Type:X-Mailer: X-Developer-Signature:X-Developer-Key:Content-Transfer-Encoding; bh=vwjxO3TYvy6WGJQYdN5saH6B1iVdIocyydf/9B8LfXQ=; b=wtKe7nXOWPdwyTlIKxfHZyG965AFpqybSuXWBhoa6DEWByO+S5jC/fkGDhcEvKO11Isz 74QKMGpbgjh6jtcmu92jFScH3sNLXNO8MajZhhWj+bB+FwpB+01WR1eqKBrYvgewMkGL6 Zby7OxlQmgKDUiHSFop5hgBy/hmbhMWZ0jy9i11I+a9xWE0F/dmLHBYD8FSXUp1X2mhg1 9jqOINIpNK58RSe1hDxjqBteXr/nsYb0iB6qg3gJ89af3luTAC4ksE9J3jQT+A3n5XgQo jrrue4vfBmC3dyGhpopgt8hK444dc6PQoqOMoFumqz9TKvSwa3t3nL333kASAG0M3/g== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=Gs5GVn7P; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 328AF606D4CD; Wed, 4 Nov 2026 19:58:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=Gs5GVn7P Received: by smtp.kernel.org (Postfix) with ESMTPSA id 443461F0093A; Wed, 4 Nov 2026 19:58:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1793822303; bh=vwjxO3TYvy6WGJQYdN5saH6B1iVdIocyydf/9B8LfXQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Gs5GVn7PVZyaHxQYP1oX1TlJKCs3atmjJ7YDkZGohYKM8gAGNVV9VT9s37IvLT63p L4L5EC1cjQvvtlvaNLN0gxqkT0/JHX+G8Jskr1+i5iT/1BEoXTgOvTBU2JoiVX9QJn SVcwPycBujDMI11yUPUBwIZob9xvtdHom3bNPfdTI6rcdnhnR9XEYbVnGufjUjHyY5 XS9Zten/fLmAjd1NEGRd3O5Jj7NFk3hoVCpRY/0FlbIUHIKxjpKo/CyBBcBbqFFOah Yl3b+onZRchWRKJM5w0VJoHNNmoc2XKJUSt61/Af1LESg+Z9BzGmnqiHsRNVJ2UfrB Y73jnPC+BIspQ== From: Christian Brauner To: linux-fsdevel@vger.kernel.org Cc: Linus Torvalds , Jann Horn , Josef Bacik , Chris Mason , Jeff Layton , NeilBrown , Eric Dumazet , Thomas Gleixner , Al Viro , Jonathan Corbet , Christoph Hellwig , Greg Kroah-Hartman , Joel Granados , Kees Cook , Jan Kara , Jan Kara , linux-kernel@vger.kernel.org, linux-nfs@vger.kernel.org, linux-acpi@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-s390@vger.kernel.org, linux-scsi@vger.kernel.org, linux-um@lists.infradead.org, linux-wireless@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, netdev@vger.kernel.org, ntfs3@lists.linux.dev, platform-driver-x86@vger.kernel.org, coreteam@netfilter.org, kexec@lists.infradead.org, linux-pci@vger.kernel.org, linux-sound@vger.kernel.org, netfilter-devel@vger.kernel.org, dri-devel@lists.freedesktop.org, ibm-acpi-devel@lists.sourceforge.net, jfs-discussion@lists.sourceforge.net, linux-alpha@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-cifs@vger.kernel.org, linux-fbdev@vger.kernel.org, linux-hwmon@vger.kernel.org, linux-mm@kvack.org, linux-sh@vger.kernel.org, linux-usb@vger.kernel.org, samba-technical@lists.samba.org, sparclinux@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-doc@vger.kernel.org, linux-serial@vger.kernel.org, linux-atm-general@lists.sourceforge.net, Takashi Iwai , linux-input@vger.kernel.org, linux-raid@vger.kernel.org, linux-ext4@vger.kernel.org, linux-modules@vger.kernel.org, linux-debuggers@vger.kernel.org, "Christian Brauner (Amutable)" , Chuck Lever Subject: [PATCH RESEND v2 02/13] l2tp: let procfs own the seq_file of /proc/net/pppol2tp Date: Wed, 4 Nov 2026 20:58:09 +0100 Message-ID: <20261104-work-procfs-net-v2-2-221e2437fed1@kernel.org> In-Reply-To: <20261104-work-procfs-net-v2-0-221e2437fed1@kernel.org> References: <20261104-work-procfs-net-v2-0-221e2437fed1@kernel.org> X-Mailing-List: netdev@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Mailer: b4 0.17-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=1918; i=brauner@kernel.org; h=from:subject:message-id; bh=/g5R4n0Ms+FYrKqMM/T6cxyrF8YI/t11/rZZuOTaMss=; b=owGbwMvMwCU28Zj0gdSKO4sYT6slMWS97lPdVvdYzebqhhVnXpw8xDvHsuzZ4RnqoW8ipiutf T4/NK+VsaOUhUGMi0FWTJHFod0kXG45T8Vmo0wNmDmsTCBDGLg4BWAiFR8Z/rtd/L6gwWtGUN41 FW63f2knOZOaTxXGXHuqJqJe7TlP+xMjw4k/LBOnuz10aXA54HTj1Qv+RZ4dDHz6dapLw8s5Ofu 5GAA= X-Developer-Key: i=brauner@kernel.org; a=openpgp; fpr=4880B8C9BD0E5106FC070F4F7B3C391EFEA93624 Content-Transfer-Encoding: 8bit Declare the seq_operations and the size of the iterator state and let procfs open and free the seq_file. ->proc_open() only takes the reference to the network namespace now and ->proc_release() drops that and the references the iterator holds. Reading the file then no longer holds up its removal. Signed-off-by: Christian Brauner (Amutable) --- net/l2tp/l2tp_ppp.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c index 4f311d473a64..499e37eb788a 100644 --- a/net/l2tp/l2tp_ppp.c +++ b/net/l2tp/l2tp_ppp.c @@ -1596,21 +1596,17 @@ static const struct seq_operations pppol2tp_seq_ops = { .show = pppol2tp_seq_show, }; +/* procfs opened the seq_file and allocated @pd */ static int pppol2tp_proc_open(struct inode *inode, struct file *file) { - struct net *net = pde_data(inode); - struct pppol2tp_seq_data *pd; + struct seq_file *seq = file->private_data; + struct pppol2tp_seq_data *pd __maybe_unused = seq->private; + struct net *net; - net = maybe_get_net(net); + net = maybe_get_net(pde_data(inode)); if (!net) return -ENXIO; - pd = __seq_open_private(file, &pppol2tp_seq_ops, sizeof(*pd)); - if (!pd) { - put_net(net); - return -ENOMEM; - } - #ifdef CONFIG_NET_NS pd->p.net = net; netns_tracker_alloc(net, &pd->p.ns_tracker, GFP_KERNEL); @@ -1633,13 +1629,13 @@ static int pppol2tp_proc_release(struct inode *inode, struct file *file) #else put_net(&init_net); #endif - return seq_release_private(inode, file); + return 0; } static const struct proc_ops pppol2tp_proc_ops = { + .proc_seq_ops = &pppol2tp_seq_ops, + .proc_state_size = sizeof(struct pppol2tp_seq_data), .proc_open = pppol2tp_proc_open, - .proc_read = seq_read, - .proc_lseek = seq_lseek, .proc_release = pppol2tp_proc_release, }; -- 2.53.0