ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 04:33:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

module: split up 'finit_module()' into init_module_from_file() helper

Browse Source 
This will simplify the next step, where we can then key off the inode to
do one idempotent module load.

Let's do the obvious re-organization in one step, and then the new code
in another.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds
2023-05-29 20:55:13 -04:00
parent 89181f544f
commit 054a73009c
1 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
kernel/module/main.c
View File

@@ -3057,26 +3057,16 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
return load_module(&info, uargs, 0); return load_module(&info, uargs, 0);
} }
SYSCALL_DEFINE3(finit_module, int, fd, const char __user *, uargs, int, flags) static int init_module_from_file(struct file *f, const char __user * uargs, int flags)
{ {
struct load_info info = { }; struct load_info info = { };
void *buf = NULL; void *buf = NULL;
int len; int len;
int err;
err = may_init_module(); if (!f || !(f->f_mode & FMODE_READ))
if (err) return -EBADF;
return err;
pr_debug("finit_module: fd=%d, uargs=%p, flags=%i\n", fd, uargs, flags); len = kernel_read_file(f, 0, &buf, INT_MAX, NULL, READING_MODULE);
if (flags & ~(MODULE_INIT_IGNORE_MODVERSIONS
|MODULE_INIT_IGNORE_VERMAGIC
|MODULE_INIT_COMPRESSED_FILE))
return -EINVAL;
len = kernel_read_file_from_fd(fd, 0, &buf, INT_MAX, NULL,
READING_MODULE);
if (len < 0) { if (len < 0) {
mod_stat_inc(&failed_kreads); mod_stat_inc(&failed_kreads);
mod_stat_add_long(len, &invalid_kread_bytes); mod_stat_add_long(len, &invalid_kread_bytes);
@@ -3084,7 +3074,7 @@ SYSCALL_DEFINE3(finit_module, int, fd, const char __user *, uargs, int, flags)
} }
if (flags & MODULE_INIT_COMPRESSED_FILE) { if (flags & MODULE_INIT_COMPRESSED_FILE) {
err = module_decompress(&info, buf, len); int err = module_decompress(&info, buf, len);
vfree(buf); /* compressed data is no longer needed */ vfree(buf); /* compressed data is no longer needed */
if (err) { if (err) {
mod_stat_inc(&failed_decompress); mod_stat_inc(&failed_decompress);
@@ -3099,6 +3089,28 @@ SYSCALL_DEFINE3(finit_module, int, fd, const char __user *, uargs, int, flags)
return load_module(&info, uargs, flags); return load_module(&info, uargs, flags);
} }
SYSCALL_DEFINE3(finit_module, int, fd, const char __user *, uargs, int, flags)
{
int err;
struct fd f;
err = may_init_module();
if (err)
return err;
pr_debug("finit_module: fd=%d, uargs=%p, flags=%i\n", fd, uargs, flags);
if (flags & ~(MODULE_INIT_IGNORE_MODVERSIONS
|MODULE_INIT_IGNORE_VERMAGIC
|MODULE_INIT_COMPRESSED_FILE))
return -EINVAL;
f = fdget(fd);
err = init_module_from_file(f.file, uargs, flags);
fdput(f);
return err;
}
/* Keep in sync with MODULE_FLAGS_BUF_SIZE !!! */ /* Keep in sync with MODULE_FLAGS_BUF_SIZE !!! */
char *module_flags(struct module *mod, char *buf, bool show_state) char *module_flags(struct module *mod, char *buf, bool show_state)
{ {