2018-12-10 07:51:15

by Chanho Min

Subject: [PATCH] exec: make prepare_bprm_creds static

prepare_bprm_creds is not used outside exec.c, so there's no reason for it
to have external linkage.

Signed-off-by: Chanho Min <[email protected]>
---
fs/exec.c | 2 +-
include/linux/binfmts.h | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/exec.c b/fs/exec.c
index fc281b7..b6c9e5f 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1399,7 +1399,7 @@ EXPORT_SYMBOL(finalize_exec);
* Or, if exec fails before, free_bprm() should release ->cred and
* and unlock.
*/
-int prepare_bprm_creds(struct linux_binprm *bprm)
+static int prepare_bprm_creds(struct linux_binprm *bprm)
{
if (mutex_lock_interruptible(&current->signal->cred_guard_mutex))
return -ERESTARTNOINTR;
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
index e9f5fe6..6a9e43d 100644
--- a/include/linux/binfmts.h
+++ b/include/linux/binfmts.h
@@ -138,7 +138,6 @@ extern int transfer_args_to_stack(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,
struct linux_binprm *bprm);
-extern int prepare_bprm_creds(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);
--
2.1.4

2018-12-10 08:32:14

by Michal Hocko

Subject: Re: [PATCH] exec: make prepare_bprm_creds static

On Mon 10-12-18 16:49:54, Chanho Min wrote:
> prepare_bprm_creds is not used outside exec.c, so there's no reason for it
> to have external linkage.
>
> Signed-off-by: Chanho Min <[email protected]>

Acked-by: Michal Hocko <[email protected]>

> ---
> fs/exec.c | 2 +-
> include/linux/binfmts.h | 1 -
> 2 files changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/fs/exec.c b/fs/exec.c
> index fc281b7..b6c9e5f 100644
> --- a/fs/exec.c
> +++ b/fs/exec.c
> @@ -1399,7 +1399,7 @@ EXPORT_SYMBOL(finalize_exec);
> * Or, if exec fails before, free_bprm() should release ->cred and
> * and unlock.
> */
> -int prepare_bprm_creds(struct linux_binprm *bprm)
> +static int prepare_bprm_creds(struct linux_binprm *bprm)
> {
> if (mutex_lock_interruptible(&current->signal->cred_guard_mutex))
> return -ERESTARTNOINTR;
> diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
> index e9f5fe6..6a9e43d 100644
> --- a/include/linux/binfmts.h
> +++ b/include/linux/binfmts.h
> @@ -138,7 +138,6 @@ extern int transfer_args_to_stack(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,
> struct linux_binprm *bprm);
> -extern int prepare_bprm_creds(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);
> --
> 2.1.4
>

--
Michal Hocko
SUSE Labs

2018-12-10 09:16:08

by Al Viro

Subject: Re: [PATCH] exec: make prepare_bprm_creds static

On Mon, Dec 10, 2018 at 04:49:54PM +0900, Chanho Min wrote:
> prepare_bprm_creds is not used outside exec.c, so there's no reason for it
> to have external linkage.

Applied...