Modules updates for v5.10
Summary of modules changes for the 5.10 merge window: - Code cleanups. More informative error messages and statically initialize init_free_wq to avoid a workqueue warning. Signed-off-by: Jessica Yu <jeyu@kernel.org> -----BEGIN PGP SIGNATURE----- iQJEBAABCAAuFiEEVrp26glSWYuDNrCUwEV+OM47wXIFAl+RbXUQHGpleXVAa2Vy bmVsLm9yZwAKCRDARX44zjvBcm/QD/42Nm/9UZB1DKL2vh/rWw3UJWN0BU05+1s9 QvSVQxKEXgEA3tEE1HP7LL5g/6JVFqypghUsX69Uf79P0FlIjlvcCoOQPSaNLXyj Md90Jg26AQiI9CrtDCQx2uli8KVUCVAtzuKOqShjUwSiIvI8yBoQpjMMRdnmxNGT HTM0yEbdD4Nfa9F/v51J0Tnq3Czj8IlIEjCuHVpyNTbaRZVGfmIJygKDRWQWh4lU fnOWLzHeARsvW7T0VvpolenPhoLp+Z+mWKeNg2XJpXpMc9RtZk85DUPn0MDVbL+b sZhQXTTsdvF0GVCsdm06wyWLuFc9ti7Oy5Ca+aHdaYsWLoYpoGwW7F7EID4dHu0a Sj9cUIWz7ss+TA64Itd5PImaSQasdsU0mGn5PVZNxqnBjlaw6scMpc8AZVXJhqPR ihSQgNELTV62AtS4zmpu2K0uVMsjCHmpXMMVkpxZYUfFOoHV4kqFn1iMGPUe9ud3 dLq3scH6GY0m2nLa0n/Qwk7GLA3X0WO49BDBY7Vwg2XbqY52i5GYiKWJux2wf5hM j4+F/iB3IVysocKpP3brGU7hjPKCjRy9KwJ7IHW7w08j/9Q0p/RNGLC+ZyP8op+i WgOjXyWiPpLr1XDS8NYVCVAEXiDBa87pKWhdkOahYLvbp24bVWlWRRFk0U8Nl06y rx6DGdGrLQ== =7nzH -----END PGP SIGNATURE----- Merge tag 'modules-for-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux Pull modules updates from Jessica Yu: "Code cleanups: more informative error messages and statically initialize init_free_wq to avoid a workqueue warning" * tag 'modules-for-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux: module: statically initialize init section freeing data module: Add more error message for failed kernel module loading
This commit is contained in:
Коммит
2b71482060
|
@ -92,8 +92,9 @@ EXPORT_SYMBOL_GPL(module_mutex);
|
|||
static LIST_HEAD(modules);
|
||||
|
||||
/* Work queue for freeing init sections in success case */
|
||||
static struct work_struct init_free_wq;
|
||||
static struct llist_head init_free_list;
|
||||
static void do_free_init(struct work_struct *w);
|
||||
static DECLARE_WORK(init_free_wq, do_free_init);
|
||||
static LLIST_HEAD(init_free_list);
|
||||
|
||||
#ifdef CONFIG_MODULES_TREE_LOOKUP
|
||||
|
||||
|
@ -2097,8 +2098,11 @@ static int module_enforce_rwx_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
|
|||
int i;
|
||||
|
||||
for (i = 0; i < hdr->e_shnum; i++) {
|
||||
if ((sechdrs[i].sh_flags & shf_wx) == shf_wx)
|
||||
if ((sechdrs[i].sh_flags & shf_wx) == shf_wx) {
|
||||
pr_err("%s: section %s (index %d) has invalid WRITE|EXEC flags\n",
|
||||
mod->name, secstrings + sechdrs[i].sh_name, i);
|
||||
return -ENOEXEC;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
@ -3591,14 +3595,6 @@ static void do_free_init(struct work_struct *w)
|
|||
}
|
||||
}
|
||||
|
||||
static int __init modules_wq_init(void)
|
||||
{
|
||||
INIT_WORK(&init_free_wq, do_free_init);
|
||||
init_llist_head(&init_free_list);
|
||||
return 0;
|
||||
}
|
||||
module_init(modules_wq_init);
|
||||
|
||||
/*
|
||||
* This is where the real work happens.
|
||||
*
|
||||
|
@ -3841,8 +3837,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
|
|||
char *after_dashes;
|
||||
|
||||
err = elf_header_check(info);
|
||||
if (err)
|
||||
if (err) {
|
||||
pr_err("Module has invalid ELF header\n");
|
||||
goto free_copy;
|
||||
}
|
||||
|
||||
err = setup_load_info(info, flags);
|
||||
if (err)
|
||||
|
@ -3850,6 +3848,7 @@ static int load_module(struct load_info *info, const char __user *uargs,
|
|||
|
||||
if (blacklisted(info->name)) {
|
||||
err = -EPERM;
|
||||
pr_err("Module %s is blacklisted\n", info->name);
|
||||
goto free_copy;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче