lkml.org 
[lkml]   [2020]   [Jun]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/6] exec: cleanup the count() function
    Date
    Remove the max argument as it is hard wired to MAX_ARG_STRINGS, and
    give the function a slightly less generic name.

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    ---
    fs/exec.c | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    diff --git a/fs/exec.c b/fs/exec.c
    index 4e5db0e35797a5..a5d91f8b1341d5 100644
    --- a/fs/exec.c
    +++ b/fs/exec.c
    @@ -407,9 +407,9 @@ get_user_arg_ptr(const char __user *const __user *argv, int nr)
    }

    /*
    - * count() counts the number of strings in array ARGV.
    + * count_strings() counts the number of strings in array ARGV.
    */
    -static int count(const char __user *const __user *argv, int max)
    +static int count_strings(const char __user *const __user *argv)
    {
    int i = 0;

    @@ -423,7 +423,7 @@ static int count(const char __user *const __user *argv, int max)
    if (IS_ERR(p))
    return -EFAULT;

    - if (i >= max)
    + if (i >= MAX_ARG_STRINGS)
    return -E2BIG;
    ++i;

    @@ -441,11 +441,11 @@ static int prepare_arg_pages(struct linux_binprm *bprm,
    {
    unsigned long limit, ptr_size;

    - bprm->argc = count(argv, MAX_ARG_STRINGS);
    + bprm->argc = count_strings(argv);
    if (bprm->argc < 0)
    return bprm->argc;

    - bprm->envc = count(envp, MAX_ARG_STRINGS);
    + bprm->envc = count_strings(envp);
    if (bprm->envc < 0)
    return bprm->envc;

    --
    2.26.2
    \
     
     \ /
      Last update: 2020-06-18 16:48    [W:4.044 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site