linux-kernel - Re: [PATCH 12/16] core: rename setrlimit to do

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 20 Nov 2009 14:10:46 +0800
From:	Américo Wang <xiyou.wangcong@...il.com>
To:	Jiri Slaby <jslaby@...ell.com>
Cc:	jirislaby@...il.com, mingo@...e.hu, nhorman@...driver.com,
	sfr@...b.auug.org.au, linux-kernel@...r.kernel.org,
	akpm@...ux-foundation.org, marcin.slusarz@...il.com,
	tglx@...utronix.de, mingo@...hat.com, hpa@...or.com,
	torvalds@...ux-foundation.org, James Morris <jmorris@...ei.org>,
	Heiko Carstens <heiko.carstens@...ibm.com>
Subject: Re: [PATCH 12/16] core: rename setrlimit to do_setrlimit

On Wed, Nov 18, 2009 at 10:51 PM, Jiri Slaby <jslaby@...ell.com> wrote:
> Rename it so that it makes more sense in the field of syscalls
> (i.e. do_* is used for functions called by syscall wrappers but
> also when called from other paths).
>
> Signed-off-by: Jiri Slaby <jslaby@...ell.com>
> Cc: James Morris <jmorris@...ei.org>
> Cc: Heiko Carstens <heiko.carstens@...ibm.com>
> Cc: Andrew Morton <akpm@...ux-foundation.org>
> Cc: Ingo Molnar <mingo@...e.hu>


Sounds good.

Reviewed-by: WANG Cong <xiyou.wangcong@...il.com>

> ---
>  fs/proc/base.c           |    2 +-
>  include/linux/resource.h |    2 +-
>  kernel/sys.c             |    4 ++--
>  3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/fs/proc/base.c b/fs/proc/base.c
> index b894170..c6589fb 100644
> --- a/fs/proc/base.c
> +++ b/fs/proc/base.c
> @@ -576,7 +576,7 @@ static ssize_t limits_write(struct file *file, const char __user *buf,
>                goto put_task;
>        }
>
> -       ret = setrlimit(task, i, &new_rlimit);
> +       ret = do_setrlimit(task, i, &new_rlimit);
>        if (ret)
>                count = ret;
>
> diff --git a/include/linux/resource.h b/include/linux/resource.h
> index 4301d67..08beb1a 100644
> --- a/include/linux/resource.h
> +++ b/include/linux/resource.h
> @@ -71,7 +71,7 @@ struct rlimit {
>  #include <asm/resource.h>
>
>  int getrusage(struct task_struct *p, int who, struct rusage __user *ru);
> -int setrlimit(struct task_struct *tsk, unsigned int resource,
> +int do_setrlimit(struct task_struct *tsk, unsigned int resource,
>                struct rlimit *new_rlim);
>
>  #endif
> diff --git a/kernel/sys.c b/kernel/sys.c
> index 52200d4..4db6ba6 100644
> --- a/kernel/sys.c
> +++ b/kernel/sys.c
> @@ -1239,7 +1239,7 @@ SYSCALL_DEFINE2(old_getrlimit, unsigned int, resource,
>  #endif
>
>  /* make sure you are allowed to change @tsk limits before calling this */
> -int setrlimit(struct task_struct *tsk, unsigned int resource,
> +int do_setrlimit(struct task_struct *tsk, unsigned int resource,
>                struct rlimit *new_rlim)
>  {
>        struct rlimit *old_rlim;
> @@ -1308,7 +1308,7 @@ SYSCALL_DEFINE2(setrlimit, unsigned int, resource, struct rlimit __user *, rlim)
>                return -EINVAL;
>        if (copy_from_user(&new_rlim, rlim, sizeof(*rlim)))
>                return -EFAULT;
> -       return setrlimit(current, resource, &new_rlim);
> +       return do_setrlimit(current, resource, &new_rlim);
>  }
>
>  /*
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/