[31/39] convert cifs_ioctl_copychunk()

Message ID	20240730051625.14349-31-viro@kernel.org (mailing list archive)
State	Not Applicable
Headers	show Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 11B1C19E7F4; Tue, 30 Jul 2024 05:15:16 +0000 (UTC) From: viro@kernel.org To: linux-fsdevel@vger.kernel.org Cc: amir73il@gmail.com, bpf@vger.kernel.org, brauner@kernel.org, cgroups@vger.kernel.org, kvm@vger.kernel.org, netdev@vger.kernel.org, torvalds@linux-foundation.org Subject: [PATCH 31/39] convert cifs_ioctl_copychunk() Date: Tue, 30 Jul 2024 01:16:17 -0400 Message-Id: <20240730051625.14349-31-viro@kernel.org> In-Reply-To: <20240730051625.14349-1-viro@kernel.org> References: <20240730050927.GC5334@ZenIV> <20240730051625.14349-1-viro@kernel.org> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	[01/39] memcg_write_event_control(): fix a user-triggerable oops \| expand [01/39] memcg_write_event_control(): fix a user-triggerable oops [02/39] introduce fd_file(), convert all accessors to it. [03/39] struct fd: representation change [04/39] add struct fd constructors, get rid of __to_fd() [05/39] regularize emptiness checks in fini_module(2) and vfs_dedupe_file_range() [06/39] net/socket.c: switch to CLASS(fd) [07/39] introduce struct fderr, convert overlayfs uses to that [08/39] experimental: convert fs/overlayfs/file.c to CLASS(...) [09/39] timerfd: switch to CLASS(fd, ...) [10/39] get rid of perf_fget_light(), convert kernel/events/core.c to CLASS(fd) [11/39] switch netlink_getsockbyfilp() to taking descriptor [12/39] do_mq_notify(): saner skb freeing on failures [13/39] do_mq_notify(): switch to CLASS(fd, ...) [14/39] simplify xfs_find_handle() a bit [15/39] convert vmsplice() to CLASS(fd, ...) [16/39] convert __bpf_prog_get() to CLASS(fd, ...) [17/39] bpf: resolve_pseudo_ldimm64(): take handling of a single ldimm64 insn into helper [18/39] bpf maps: switch to CLASS(fd, ...) [19/39] fdget_raw() users: switch to CLASS(fd_raw, ...) [20/39] introduce "fd_pos" class, convert fdget_pos() users to it. [21/39] o2hb_region_dev_store(): avoid goto around fdget()/fdput() [22/39] privcmd_ioeventfd_assign(): don't open-code eventfd_ctx_fdget() [23/39] fdget(), trivial conversions [24/39] fdget(), more trivial conversions [25/39] convert do_preadv()/do_pwritev() [26/39] convert cachestat(2) [27/39] switch spufs_calls_{get,put}() to CLASS() use [28/39] convert spu_run(2) [29/39] convert media_request_get_by_fd() [30/39] convert coda_parse_fd() [31/39] convert cifs_ioctl_copychunk() [32/39] convert vfs_dedupe_file_range(). [33/39] convert do_select() [34/39] do_pollfd(): convert to CLASS(fd) [35/39] convert bpf_token_create() [36/39] assorted variants of irqfd setup: convert to CLASS(fd) [37/39] memcg_write_event_control(): switch to CLASS(fd) [38/39] css_set_fork(): switch to CLASS(fd_raw, ...) [39/39] deal with the last remaing boolean uses of fd_file()

Message ID

20240730051625.14349-31-viro@kernel.org (mailing list archive)

State

Not Applicable

Headers

From: viro@kernel.org
To: linux-fsdevel@vger.kernel.org
Cc: amir73il@gmail.com,
	bpf@vger.kernel.org,
	brauner@kernel.org,
	cgroups@vger.kernel.org,
	kvm@vger.kernel.org,
	netdev@vger.kernel.org,
	torvalds@linux-foundation.org
Subject: [PATCH 31/39] convert cifs_ioctl_copychunk()
Date: Tue, 30 Jul 2024 01:16:17 -0400
Message-Id: <20240730051625.14349-31-viro@kernel.org>
In-Reply-To: <20240730051625.14349-1-viro@kernel.org>
References: <20240730050927.GC5334@ZenIV>
 <20240730051625.14349-1-viro@kernel.org>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

[01/39] memcg_write_event_control(): fix a user-triggerable oops | expand

Context	Check	Description
netdev/tree_selection	success	Guessing tree name failed - patch did not apply, async

Context

Check

Description

netdev/tree_selection

success

Guessing tree name failed - patch did not apply, async

Commit Message

Al Viro July 30, 2024, 5:16 a.m. UTC

From: Al Viro <viro@zeniv.linux.org.uk>

fdput() moved past mnt_drop_file_write(); harmless, if somewhat cringeworthy.
Reordering could be avoided either by adding an explicit scope or by making
mnt_drop_file_write() called via __cleanup.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
 fs/smb/client/ioctl.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

Comments

Christian Brauner Aug. 7, 2024, 10:41 a.m. UTC | #1

On Tue, Jul 30, 2024 at 01:16:17AM GMT, viro@kernel.org wrote:
> From: Al Viro <viro@zeniv.linux.org.uk>
> 
> fdput() moved past mnt_drop_file_write(); harmless, if somewhat cringeworthy.
> Reordering could be avoided either by adding an explicit scope or by making
> mnt_drop_file_write() called via __cleanup.
> 
> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
> ---

Reviewed-by: Christian Brauner <brauner@kernel.org>

diff --git a/fs/smb/client/ioctl.c b/fs/smb/client/ioctl.c
index 94bf2e5014d9..6d9df3646df3 100644
--- a/fs/smb/client/ioctl.c
+++ b/fs/smb/client/ioctl.c
@@ -72,7 +72,6 @@  static long cifs_ioctl_copychunk(unsigned int xid, struct file *dst_file,
 			unsigned long srcfd)
 {
 	int rc;
-	struct fd src_file;
 	struct inode *src_inode;
 
 	cifs_dbg(FYI, "ioctl copychunk range\n");
@@ -89,8 +88,8 @@  static long cifs_ioctl_copychunk(unsigned int xid, struct file *dst_file,
 		return rc;
 	}
 
-	src_file = fdget(srcfd);
-	if (!fd_file(src_file)) {
+	CLASS(fd, src_file)(srcfd);
+	if (fd_empty(src_file)) {
 		rc = -EBADF;
 		goto out_drop_write;
 	}
@@ -98,20 +97,18 @@  static long cifs_ioctl_copychunk(unsigned int xid, struct file *dst_file,
 	if (fd_file(src_file)->f_op->unlocked_ioctl != cifs_ioctl) {
 		rc = -EBADF;
 		cifs_dbg(VFS, "src file seems to be from a different filesystem type\n");
-		goto out_fput;
+		goto out_drop_write;
 	}
 
 	src_inode = file_inode(fd_file(src_file));
 	rc = -EINVAL;
 	if (S_ISDIR(src_inode->i_mode))
-		goto out_fput;
+		goto out_drop_write;
 
 	rc = cifs_file_copychunk_range(xid, fd_file(src_file), 0, dst_file, 0,
 					src_inode->i_size, 0);
 	if (rc > 0)
 		rc = 0;
-out_fput:
-	fdput(src_file);
 out_drop_write:
 	mnt_drop_write_file(dst_file);
 	return rc;

[31/39] convert cifs_ioctl_copychunk()

Checks

Commit Message

Comments

Patch