exec-simplify-the-copy_strings_kernel-calling-convention.patch removed from -mm tree
The patch titled
Subject: exec: simplify the copy_strings_kernel calling convention
has been removed from the -mm tree. Its filename was
exec-simplify-the-copy_strings_kernel-calling-convention.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Christoph Hellwig <[email protected]>
Subject: exec: simplify the copy_strings_kernel calling convention
copy_strings_kernel is always used with a single argument, adjust the calling convention to that.
---
fs/binfmt_em86.c | 6 +++--- fs/binfmt_misc.c | 4 ++-- fs/binfmt_script.c | 6 +++--- fs/exec.c | 13 ++++++------- include/linux/binfmts.h | 3 +-- 5 files changed, 15 insertions(+), 17 deletions(-)
fs/binfmt_em86.c renamed from fs/binfmt_em86.c~exec-simplify-the-copy_strings_kernel-calling-convention +3 -3
@@ -68,15 +68,15 @@ static int load_em86(struct linux_binprm* user environment and arguments are stored. */ remove_arg_zero (bprm); - retval =copy_strings_kernel (1 , &bprm->filename, bprm); + retval =copy_string_kernel (bprm->filename, bprm);if (retval <0 )return retval; bprm->argc++;if (i_arg) { - retval =copy_strings_kernel (1 , &i_arg, bprm); + retval =copy_string_kernel (i_arg, bprm);if (retval <0 )return retval; bprm->argc++; } - retval =copy_strings_kernel (1 , &i_name, bprm); + retval =copy_string_kernel (i_name, bprm);if (retval <0 )return retval; bprm->argc++;
fs/binfmt_misc.c renamed from fs/binfmt_misc.c~exec-simplify-the-copy_strings_kernel-calling-convention +2 -2
@@ -190,13 +190,13 @@ static int load_misc_binary(struct linux bprm->file =NULL ; }/* make argv[1] be the path to the binary */ - retval =copy_strings_kernel (1 , &bprm->interp, bprm); + retval =copy_string_kernel (bprm->interp, bprm);if (retval <0 ) goto error; bprm->argc++;/* add the interp as argv[0] */ - retval =copy_strings_kernel (1 , &fmt->interpreter, bprm); + retval =copy_string_kernel (fmt->interpreter, bprm);if (retval <0 ) goto error; bprm->argc++;
fs/binfmt_script.c renamed from fs/binfmt_script.c~exec-simplify-the-copy_strings_kernel-calling-convention +3 -3
@@ -117,17 +117,17 @@ static int load_script(struct linux_binp retval =remove_arg_zero (bprm);if (retval)return retval; - retval =copy_strings_kernel (1 , &bprm->interp, bprm); + retval =copy_string_kernel (bprm->interp, bprm);if (retval <0 )return retval; bprm->argc++;if (i_arg) { - retval =copy_strings_kernel (1 , &i_arg, bprm); + retval =copy_string_kernel (i_arg, bprm);if (retval <0 )return retval; bprm->argc++; } - retval =copy_strings_kernel (1 , &i_name, bprm); + retval =copy_string_kernel (i_name, bprm);if (retval)return retval; bprm->argc++;
fs/exec.c renamed from fs/exec.c~exec-simplify-the-copy_strings_kernel-calling-convention +6 -7
@@ -588,24 +588,23 @@ out: }/* -* Like copy_strings, but get argv and its values from kernel memory. +* Copy and argument/environment string from the kernel to the processes stack. */ -int copy_strings_kernel (int argc,const char *const *__argv, -struct linux_binprm *bprm) +int copy_string_kernel (const char *arg,struct linux_binprm *bprm) {int r;mm_segment_t oldfs =get_fs ();struct user_arg_ptr argv = { - .ptr.native = (const char __user *const __user *)__argv, + .ptr.native = (const char __user *const __user *)&arg, };set_fs (KERNEL_DS ); - r =copy_strings (argc, argv, bprm); + r =copy_strings (1 , argv, bprm);set_fs (oldfs);return r; } -EXPORT_SYMBOL (copy_strings_kernel); +EXPORT_SYMBOL (copy_string_kernel);#ifdef CONFIG_MMU
@@ -1865,7 +1864,7 @@ static int __do_execve_file(int fd, struif (retval <0 ) goto out; - retval =copy_strings_kernel (1 , &bprm->filename, bprm); + retval =copy_string_kernel (bprm->filename, bprm);if (retval <0 ) goto out;
include/linux/binfmts.h renamed from include/linux/binfmts.h~exec-simplify-the-copy_strings_kernel-calling-convention +1 -2
@@ -144,8 +144,7 @@ extern int setup_arg_pages(struct linux_extern int transfer_args_to_stack (struct linux_binprm *bprm,unsigned long *sp_location);extern int bprm_change_interp (const char *interp,struct linux_binprm *bprm); -extern int copy_strings_kernel (int argc,const char *const *argv, -struct linux_binprm *bprm); +int copy_string_kernel (const char *arg,struct linux_binprm *bprm);extern void install_exec_creds (struct linux_binprm *bprm);extern void set_binfmt (struct linux_binfmt *new);extern ssize_t read_code (struct file *,unsigned long ,loff_t ,size_t );
_
Patches currently in -mm which might be from [email protected] are
amdgpu-a-null-mm-does-not-mean-a-thread-is-a-kthread.patch kernel-move-use_mm-unuse_mm-to-kthreadc.patch kernel-move-use_mm-unuse_mm-to-kthreadc-v2.patch kernel-better-document-the-use_mm-unuse_mm-api-contract.patch kernel-better-document-the-use_mm-unuse_mm-api-contract-v2.patch kernel-set-user_ds-in-kthread_use_mm.patch arm-fix-the-flush_icache_range-arguments-in-set_fiq_handler.patch nds32-unexport-flush_icache_page.patch powerpc-unexport-flush_icache_user_range.patch unicore32-remove-flush_cache_user_range.patch asm-generic-fix-the-inclusion-guards-for-cacheflushh.patch asm-generic-dont-include-linux-mmh-in-cacheflushh.patch asm-generic-dont-include-linux-mmh-in-cacheflushh-fix.patch asm-generic-improve-the-flush_dcache_page-stub.patch alpha-use-asm-generic-cacheflushh.patch arm64-use-asm-generic-cacheflushh.patch c6x-use-asm-generic-cacheflushh.patch hexagon-use-asm-generic-cacheflushh.patch ia64-use-asm-generic-cacheflushh.patch microblaze-use-asm-generic-cacheflushh.patch m68knommu-use-asm-generic-cacheflushh.patch openrisc-use-asm-generic-cacheflushh.patch powerpc-use-asm-generic-cacheflushh.patch riscv-use-asm-generic-cacheflushh.patch armsparcunicore32-remove-flush_icache_user_range.patch mm-rename-flush_icache_user_range-to-flush_icache_user_page.patch asm-generic-add-a-flush_icache_user_range-stub.patch sh-implement-flush_icache_user_range.patch xtensa-implement-flush_icache_user_range.patch arm-rename-flush_cache_user_range-to-flush_icache_user_range.patch m68k-implement-flush_icache_user_range.patch exec-only-build-read_code-when-needed.patch exec-use-flush_icache_user_range-in-read_code.patch binfmt_flat-use-flush_icache_user_range.patch nommu-use-flush_icache_user_range-in-brk-and-mmap.patch module-move-the-set_fs-hack-for-flush_icache_range-to-m68k.patch maccess-unexport-probe_kernel_write-and-probe_user_write.patch maccess-remove-various-unused-weak-aliases.patch maccess-remove-duplicate-kerneldoc-comments.patch maccess-clarify-kerneldoc-comments.patch maccess-update-the-top-of-file-comment.patch maccess-rename-strncpy_from_unsafe_user-to-strncpy_from_user_nofault.patch maccess-rename-strncpy_from_unsafe_strict-to-strncpy_from_kernel_nofault.patch maccess-rename-strnlen_unsafe_user-to-strnlen_user_nofault.patch maccess-remove-probe_read_common-and-probe_write_common.patch maccess-unify-the-probe-kernel-arch-hooks.patch bpf-factor-out-a-bpf_trace_copy_string-helper.patch bpf-handle-the-compat-string-in-bpf_trace_copy_string-better.patch bpf-rework-the-compat-kernel-probe-handling.patch tracing-kprobes-handle-mixed-kernel-userspace-probes-better.patch maccess-remove-strncpy_from_unsafe.patch maccess-always-use-strict-semantics-for-probe_kernel_read.patch maccess-move-user-access-routines-together.patch maccess-allow-architectures-to-provide-kernel-probing-directly.patch x86-use-non-set_fs-based-maccess-routines.patch maccess-return-erange-when-copy_from_kernel_nofault_allowed-fails.patch