[14/19] finit_module(): convert to CLASS(fd, ...)

Message ID	20240607015957.2372428-14-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 A7E9A14006 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 14/19] finit_module(): convert to CLASS(fd, ...) Date: Fri, 7 Jun 2024 02:59:52 +0100 Message-Id: <20240607015957.2372428-14-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-14-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 14/19] finit_module(): convert to CLASS(fd, ...)
Date: Fri,  7 Jun 2024 02:59:52 +0100
Message-Id: <20240607015957.2372428-14-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

Slightly unidiomatic emptiness check; just lift it out of idempotent_init_module()
and into finit_module(2) and that's it.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
 kernel/module/main.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/kernel/module/main.c b/kernel/module/main.c
index 98fda13fdca7..f2f045b3740d 100644
--- a/kernel/module/main.c
+++ b/kernel/module/main.c
@@ -3177,7 +3177,7 @@  static int idempotent_init_module(struct file *f, const char __user * uargs, int
 {
 	struct idempotent idem;
 
-	if (!f || !(f->f_mode & FMODE_READ))
+	if (!(f->f_mode & FMODE_READ))
 		return -EBADF;
 
 	/* See if somebody else is doing the operation? */
@@ -3193,10 +3193,7 @@  static int idempotent_init_module(struct file *f, const char __user * uargs, int
 
 SYSCALL_DEFINE3(finit_module, int, fd, const char __user *, uargs, int, flags)
 {
-	int err;
-	struct fd f;
-
-	err = may_init_module();
+	int err = may_init_module();
 	if (err)
 		return err;
 
@@ -3207,10 +3204,10 @@  SYSCALL_DEFINE3(finit_module, int, fd, const char __user *, uargs, int, flags)
 		      |MODULE_INIT_COMPRESSED_FILE))
 		return -EINVAL;
 
-	f = fdget(fd);
-	err = idempotent_init_module(fd_file(f), uargs, flags);
-	fdput(f);
-	return err;
+	CLASS(fd, f)(fd);
+	if (fd_empty(f))
+		return -EBADF;
+	return idempotent_init_module(fd_file(f), uargs, flags);
 }
 
 /* Keep in sync with MODULE_FLAGS_BUF_SIZE !!! */

[14/19] finit_module(): convert to CLASS(fd, ...)

Commit Message

Patch