diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2024-07-19 21:19:02 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2024-11-03 01:28:06 -0500 |
| commit | 8152f8201088350c76bb9685cd5990dd51d59aff (patch) | |
| tree | d8c16f772fd79b751e19b29d420b6818239c94e6 /kernel/module | |
| parent | 6348be02eead77bdd1562154ed6b3296ad3b3750 (diff) | |
| download | linux-8152f8201088350c76bb9685cd5990dd51d59aff.tar.gz linux-8152f8201088350c76bb9685cd5990dd51d59aff.tar.bz2 linux-8152f8201088350c76bb9685cd5990dd51d59aff.zip | |
fdget(), more trivial conversions
all failure exits prior to fdget() leave the scope, all matching fdput()
are immediately followed by leaving the scope.
[xfs_ioc_commit_range() chunk moved here as well]
Reviewed-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'kernel/module')
| -rw-r--r-- | kernel/module/main.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/kernel/module/main.c b/kernel/module/main.c index d785973d8a51..4490924fe24e 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -3219,10 +3219,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; @@ -3233,12 +3230,10 @@ SYSCALL_DEFINE3(finit_module, int, fd, const char __user *, uargs, int, flags) |MODULE_INIT_COMPRESSED_FILE)) return -EINVAL; - f = fdget(fd); + CLASS(fd, f)(fd); if (fd_empty(f)) return -EBADF; - err = idempotent_init_module(fd_file(f), uargs, flags); - fdput(f); - return err; + return idempotent_init_module(fd_file(f), uargs, flags); } /* Keep in sync with MODULE_FLAGS_BUF_SIZE !!! */ |