mirrors
/
deepin-kernel
mirror of https://github.com/deepin-community/kernel.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

exec: simplify the copy_strings_kernel calling convention 

copy_strings_kernel is always used with a single argument,
adjust the calling convention to that.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Link: http://lkml.kernel.org/r/20200501104105.2621149-2-hch@lst.de
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Christoph Hellwig 2020-06-04 16:51:14 -07:00 committed by Linus Torvalds
parent eac2cece45
commit 986db2d14a
5 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/binfmt_em86.c
View File

@ -68,15 +68,15 @@ static int load_em86(struct linux_binprm *bprm)
* user environment and arguments are stored. * user environment and arguments are stored.
*/ */
remove_arg_zero(bprm); remove_arg_zero(bprm);
retval = copy_strings_kernel(1, &bprm->filename, bprm); retval = copy_string_kernel(bprm->filename, bprm);
if (retval < 0) return retval; if (retval < 0) return retval;
bprm->argc++; bprm->argc++;
if (i_arg) { if (i_arg) {
retval = copy_strings_kernel(1, &i_arg, bprm); retval = copy_string_kernel(i_arg, bprm);
if (retval < 0) return retval; if (retval < 0) return retval;
bprm->argc++; bprm->argc++;
} }
retval = copy_strings_kernel(1, &i_name, bprm); retval = copy_string_kernel(i_name, bprm);
if (retval < 0) return retval; if (retval < 0) return retval;
bprm->argc++; bprm->argc++;

4
fs/binfmt_misc.c
View File

@ -190,13 +190,13 @@ static int load_misc_binary(struct linux_binprm *bprm)
bprm->file = NULL; bprm->file = NULL;
} }
/* make argv[1] be the path to the binary */ /* 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) if (retval < 0)
goto error; goto error;
bprm->argc++; bprm->argc++;
/* add the interp as argv[0] */ /* add the interp as argv[0] */
retval = copy_strings_kernel(1, &fmt->interpreter, bprm); retval = copy_string_kernel(fmt->interpreter, bprm);
if (retval < 0) if (retval < 0)
goto error; goto error;
bprm->argc++; bprm->argc++;

6
fs/binfmt_script.c
View File

@ -117,17 +117,17 @@ static int load_script(struct linux_binprm *bprm)
retval = remove_arg_zero(bprm); retval = remove_arg_zero(bprm);
if (retval) if (retval)
return retval; return retval;
retval = copy_strings_kernel(1, &bprm->interp, bprm); retval = copy_string_kernel(bprm->interp, bprm);
if (retval < 0) if (retval < 0)
return retval; return retval;
bprm->argc++; bprm->argc++;
if (i_arg) { if (i_arg) {
retval = copy_strings_kernel(1, &i_arg, bprm); retval = copy_string_kernel(i_arg, bprm);
if (retval < 0) if (retval < 0)
return retval; return retval;
bprm->argc++; bprm->argc++;
} }
retval = copy_strings_kernel(1, &i_name, bprm); retval = copy_string_kernel(i_name, bprm);
if (retval) if (retval)
return retval; return retval;
bprm->argc++; bprm->argc++;

13
fs/exec.c
View File

@ -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, int copy_string_kernel(const char *arg, struct linux_binprm *bprm)
struct linux_binprm *bprm)
{ {
int r; int r;
mm_segment_t oldfs = get_fs(); mm_segment_t oldfs = get_fs();
struct user_arg_ptr argv = { 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); set_fs(KERNEL_DS);
r = copy_strings(argc, argv, bprm); r = copy_strings(1, argv, bprm);
set_fs(oldfs); set_fs(oldfs);
return r; return r;
} }
EXPORT_SYMBOL(copy_strings_kernel); EXPORT_SYMBOL(copy_string_kernel);
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
@ -1865,7 +1864,7 @@ static int __do_execve_file(int fd, struct filename *filename,
if (retval < 0) if (retval < 0)
goto out; goto out;
retval = copy_strings_kernel(1, &bprm->filename, bprm); retval = copy_string_kernel(bprm->filename, bprm);
if (retval < 0) if (retval < 0)
goto out; goto out;

3
include/linux/binfmts.h
View File

@ -144,8 +144,7 @@ extern int setup_arg_pages(struct linux_binprm * bprm,
extern int transfer_args_to_stack(struct linux_binprm *bprm, extern int transfer_args_to_stack(struct linux_binprm *bprm,
unsigned long *sp_location); unsigned long *sp_location);
extern int bprm_change_interp(const char *interp, struct linux_binprm *bprm); extern int bprm_change_interp(const char *interp, struct linux_binprm *bprm);
extern int copy_strings_kernel(int argc, const char *const *argv, int copy_string_kernel(const char *arg, struct linux_binprm *bprm);
struct linux_binprm *bprm);
extern void install_exec_creds(struct linux_binprm *bprm); extern void install_exec_creds(struct linux_binprm *bprm);
extern void set_binfmt(struct linux_binfmt *new); extern void set_binfmt(struct linux_binfmt *new);
extern ssize_t read_code(struct file *, unsigned long, loff_t, size_t); extern ssize_t read_code(struct file *, unsigned long, loff_t, size_t);