[13/19] convert vmsplice() to CLASS(fd, ...)

Message ID	20240607015957.2372428-13-viro@zeniv.linux.org.uk (mailing list archive)
State	New
Headers	show Received: from zeniv.linux.org.uk (zeniv.linux.org.uk [62.89.141.173]) (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 845AE12E7E for <linux-fsdevel@vger.kernel.org>; Fri, 7 Jun 2024 02:00:01 +0000 (UTC) From: Al Viro <viro@zeniv.linux.org.uk> To: linux-fsdevel@vger.kernel.org Cc: brauner@kernel.org, torvalds@linux-foundation.org Subject: [PATCH 13/19] convert vmsplice() to CLASS(fd, ...) Date: Fri, 7 Jun 2024 02:59:51 +0100 Message-Id: <20240607015957.2372428-13-viro@zeniv.linux.org.uk> In-Reply-To: <20240607015957.2372428-1-viro@zeniv.linux.org.uk> References: <20240607015656.GX1629371@ZenIV> <20240607015957.2372428-1-viro@zeniv.linux.org.uk> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Al Viro <viro@ftp.linux.org.uk>
Series	[01/19] powerpc: fix a file leak in kvm_vcpu_ioctl_enable_cap() \| expand [01/19] powerpc: fix a file leak in kvm_vcpu_ioctl_enable_cap() [02/19] lirc: rc_dev_get_from_fd(): fix file leak [03/19] introduce fd_file(), convert all accessors to it. [04/19] struct fd: representation change [05/19] add struct fd constructors, get rid of __to_fd() [06/19] net/socket.c: switch to CLASS(fd) [07/19] introduce struct fderr, convert overlayfs uses to that [08/19] fdget_raw() users: switch to CLASS(fd_raw, ...) [09/19] css_set_fork(): switch to CLASS(fd_raw, ...) [10/19] introduce "fd_pos" class [11/19] switch simple users of fdget() to CLASS(fd, ...) [12/19] bpf: switch to CLASS(fd, ...) [13/19] convert vmsplice() to CLASS(fd, ...) [14/19] finit_module(): convert to CLASS(fd, ...) [15/19] timerfd: switch to CLASS(fd, ...) [16/19] do_mq_notify(): switch to CLASS(fd, ...) [17/19] simplify xfs_find_handle() a bit [18/19] convert kernel/events/core.c [19/19] deal with the last remaing boolean uses of fd_file()

Message ID

20240607015957.2372428-13-viro@zeniv.linux.org.uk (mailing list archive)

State

New

Headers

From: Al Viro <viro@zeniv.linux.org.uk>
To: linux-fsdevel@vger.kernel.org
Cc: brauner@kernel.org,
	torvalds@linux-foundation.org
Subject: [PATCH 13/19] convert vmsplice() to CLASS(fd, ...)
Date: Fri,  7 Jun 2024 02:59:51 +0100
Message-Id: <20240607015957.2372428-13-viro@zeniv.linux.org.uk>
In-Reply-To: <20240607015957.2372428-1-viro@zeniv.linux.org.uk>
References: <20240607015656.GX1629371@ZenIV>
 <20240607015957.2372428-1-viro@zeniv.linux.org.uk>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: Al Viro <viro@ftp.linux.org.uk>

Series

[01/19] powerpc: fix a file leak in kvm_vcpu_ioctl_enable_cap() | expand

Commit Message

Al Viro June 7, 2024, 1:59 a.m. UTC

Irregularity here is fdput() not in the same scope as fdget(); we could
just lift it out vmsplice_type() in vmsplice(2), but there's no much
point keeping vmsplice_type() separate after that...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
 fs/splice.c | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/fs/splice.c b/fs/splice.c
index 42aa7bc46be5..2898fa1e9e63 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -1564,21 +1564,6 @@  static ssize_t vmsplice_to_pipe(struct file *file, struct iov_iter *iter,
 	return ret;
 }
 
-static int vmsplice_type(struct fd f, int *type)
-{
-	if (!fd_file(f))
-		return -EBADF;
-	if (fd_file(f)->f_mode & FMODE_WRITE) {
-		*type = ITER_SOURCE;
-	} else if (fd_file(f)->f_mode & FMODE_READ) {
-		*type = ITER_DEST;
-	} else {
-		fdput(f);
-		return -EBADF;
-	}
-	return 0;
-}
-
 /*
  * Note that vmsplice only really supports true splicing _from_ user memory
  * to a pipe, not the other way around. Splicing from user memory is a simple
@@ -1602,21 +1587,25 @@  SYSCALL_DEFINE4(vmsplice, int, fd, const struct iovec __user *, uiov,
 	struct iovec *iov = iovstack;
 	struct iov_iter iter;
 	ssize_t error;
-	struct fd f;
 	int type;
 
 	if (unlikely(flags & ~SPLICE_F_ALL))
 		return -EINVAL;
 
-	f = fdget(fd);
-	error = vmsplice_type(f, &type);
-	if (error)
-		return error;
+	CLASS(fd, f)(fd);
+	if (fd_empty(f))
+		return -EBADF;
+	if (fd_file(f)->f_mode & FMODE_WRITE)
+		type = ITER_SOURCE;
+	else if (fd_file(f)->f_mode & FMODE_READ)
+		type = ITER_DEST;
+	else
+		return -EBADF;
 
 	error = import_iovec(type, uiov, nr_segs,
 			     ARRAY_SIZE(iovstack), &iov, &iter);
 	if (error < 0)
-		goto out_fdput;
+		return error;
 
 	if (!iov_iter_count(&iter))
 		error = 0;

[13/19] convert vmsplice() to CLASS(fd, ...)

Commit Message

Patch