From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (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 912756096237 for ; Mon, 2 Nov 2026 15:20:33 +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=BN1DryDe Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4jJFl42Mc1z3btX; Tue, 03 Nov 2026 02:20:32 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip=172.234.252.31 ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1793632832; cv=none; b=jyaVcI75kp4qLsLNMPkEscDNSrGogl9SN6hmtbMxufBD9CMw98m4dgSnEsVYsHBpetwu1nyV8g7ZIZBp6o16M226ehTb6BeZd4w5mi4EUPWGeYruWQIv47DN6Dsq6/tIvqU6q/m+qpj1kmpJXfWs/9Mxg3S+ZLcFzZhcFCw1l/bh+lyEQeVOFB5T7NY0bUcHEc1lLzZFLkBTEpHk9o8EeUv2PazynEopFl/qBhwcgXKohSBrYg4dZo3Rec9iUbfmIn+UWTM/UNaY9/IQR6GpoqL8ixXmxq86IWLSFXiEqVTmkIZMmD/ZTef2gxsWZy6WxR9yKFqPmgkgoniqGMGWgg== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1793632832; c=relaxed/relaxed; bh=yfb68sR2lkv/WstwrNi2kV1cVJpZCk5/QcENUoLv//k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VBnLNJ3ak/sZjW29z7OPq34Lj4PvDcPCzoKP8GiifyaUR/TXp8OA0uIWlHww5hIUydarJOkRoCgupVPC5IlxIu+cTBd2hq3Aorai6UiWKcKA0odDA23DcyTDlDaZVGdflm4SQl6/mZdcFNU2ljA5w3oXN7OJjHMw4skMlZvvu7TjOzRFwslFPgTGlOKbh/h+LZdOd4GJRQAzAiFmChqaISuxq9uF1RzGLejaaEo2HxyL2Z6auLvs000JD8sgaiivdXPwcmnHG2balo2R9sI/n336/k++bcyjNGuNzCrbR44UxVHollr0sKY5+u8laKJZsl0+iJdWQP0FUQm78zELKw== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=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=BN1DryDe; dkim-atps=neutral; spf=pass (client-ip=172.234.252.31; helo=sea.source.kernel.org; envelope-from=brauner@kernel.org; receiver=lists.ozlabs.org) smtp.mailfrom=kernel.org Authentication-Results: lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=BN1DryDe; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=172.234.252.31; helo=sea.source.kernel.org; envelope-from=brauner@kernel.org; receiver=lists.ozlabs.org) Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4jJFl32pGDz3btP for ; Tue, 03 Nov 2026 02:20:31 +1100 (AEDT) Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by sea.source.kernel.org (Postfix) with ESMTP id B99B842462; Mon, 2 Nov 2026 15:20:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D70991F00A18; Mon, 2 Nov 2026 15:20:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1793632829; bh=yfb68sR2lkv/WstwrNi2kV1cVJpZCk5/QcENUoLv//k=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=BN1DryDe3qV+C4aWHJuIRcQk7/grenL2yY2/u1V9RuZ76eccMjBgLsEcUTNnhaGbx eXhhwX7Vgu+zR+JmG/2wvin1dOiYZvsWSYg6kfl1F4CTtJJewyZhllNVl1QPSHankI Y/8n3DCOX6o11uevej4+0kaVGNpGzwrrLFwkHxO8Xf20op7zpFONM4MND0dOsyrGS9 lt+VjVHm27V5kG1yhzDMUWKDR0YRqKdDimg5wHtncjttH7DdkNFA88vxAFcS8nd5HC WE2enuopE0QMfUuIQi9FBTnJNj/5vBq/jOfhCbxPWlMeXV21MywGi2MtjhSPk+gxJF /V1HSYuIItaBw== From: Christian Brauner Date: Mon, 02 Nov 2026 16:07:13 +0100 Subject: [PATCH RFC 03/27] lockd: let procfs copy in writes to nlm_end_grace X-Mailing-List: linuxppc-dev@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Archive: , List-Subscribe: , , Precedence: list X-Archived-By: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261102-work-procfs-fs-v1-3-d09a996317b3@kernel.org> References: <20261102-work-procfs-fs-v1-0-d09a996317b3@kernel.org> In-Reply-To: <20261102-work-procfs-fs-v1-0-d09a996317b3@kernel.org> 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 X-Mailer: b4 0.17-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=1756; i=brauner@kernel.org; h=from:subject:message-id; bh=yoBjzpwXPCFL2mmsMcO6fDyZh19yBZX5M0Ko6zu/SW0=; b=owGbwMvMwCU28Zj0gdSKO4sYT6slMWS9WG4otvP03RvTPvA6+q/2CHm77dh8jlWRxmva3p208 Ze+9//u4Y5SFgYxLgZZMUUWh3aTcLnlPBWbjTI1YOawMoEMYeDiFICJzFzD8JNRYNGmuUuv5fXJ SixnOtLlrT9xxidJDp7+ycnCGRxRXQ8Z/qlce21cuoK5yfPMxbQIy6ar6sn9zobuoRNUY3eHqBs eYwQA X-Developer-Key: i=brauner@kernel.org; a=openpgp; fpr=4880B8C9BD0E5106FC070F4F7B3C391EFEA93624 X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 Implement ->proc_write_buf() so procfs copies in what is written before it pins the entry. simple_transaction_get() was only used to get a copy of what was written, so look at procfs' copy instead and drop the transaction. A second write to the same file doesn't fail with -EBUSY anymore. Writes larger than PAGE_SIZE - 1 bytes fail with -EINVAL from procfs instead of -EFBIG from simple_transaction_get(), which refused a few bytes less. Signed-off-by: Christian Brauner (Amutable) --- fs/lockd/procfs.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/fs/lockd/procfs.c b/fs/lockd/procfs.c index a01f08c8c2f3..47949bec7a09 100644 --- a/fs/lockd/procfs.c +++ b/fs/lockd/procfs.c @@ -18,21 +18,15 @@ * We only allow strings that start with 'Y', 'y', or '1'. */ static ssize_t -nlm_end_grace_write(struct file *file, const char __user *buf, size_t size, - loff_t *pos) +nlm_end_grace_write(struct file *file, char *buf, size_t size, loff_t *pos) { - char *data; struct lockd_net *ln = net_generic(current->nsproxy->net_ns, lockd_net_id); if (size < 1) return -EINVAL; - data = simple_transaction_get(file, buf, size); - if (IS_ERR(data)) - return PTR_ERR(data); - - switch(data[0]) { + switch(buf[0]) { case 'Y': case 'y': case '1': @@ -61,10 +55,9 @@ nlm_end_grace_read(struct file *file, char __user *buf, size_t size, } static const struct proc_ops lockd_end_grace_proc_ops = { - .proc_write = nlm_end_grace_write, + .proc_write_buf = nlm_end_grace_write, .proc_read = nlm_end_grace_read, .proc_lseek = default_llseek, - .proc_release = simple_transaction_release, }; int __init -- 2.53.0