linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: ebiederm@xmission.com (Eric W. Biederman)
To: Andrei Vagin <avagin@gmail.com>
Cc: linux-kernel@vger.kernel.org, Kees Cook <keescook@chromium.org>,
	linux-fsdevel@vger.kernel.org
Subject: Re: [PATCH] exec/binfmt_script: trip zero bytes from the buffer
Date: Tue, 15 Jun 2021 14:33:20 -0500	[thread overview]
Message-ID: <877diuq5xb.fsf@disp2133> (raw)
In-Reply-To: <20210615162346.16032-1-avagin@gmail.com> (Andrei Vagin's message of "Tue, 15 Jun 2021 09:23:46 -0700")

Andrei Vagin <avagin@gmail.com> writes:

> Without this fix, if we try to run a script that contains only the
> interpreter line, the interpreter is executed with one extra empty
> argument.
>
> The code is written so that i_end has to be set to the end of valuable
> data in the buffer.

Out of curiosity how did you spot this change in behavior?

> Fixes: ccbb18b67323 ("exec/binfmt_script: Don't modify bprm->buf and then return -ENOEXEC")
> Cc: "Eric W. Biederman" <ebiederm@xmission.com>
> Signed-off-by: Andrei Vagin <avagin@gmail.com>
> ---
>  fs/binfmt_script.c | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/fs/binfmt_script.c b/fs/binfmt_script.c
> index 1b6625e95958..e242680f96e1 100644
> --- a/fs/binfmt_script.c
> +++ b/fs/binfmt_script.c
> @@ -68,6 +68,9 @@ static int load_script(struct linux_binprm *bprm)
>  		if (!next_terminator(i_end, buf_end))
>  			return -ENOEXEC;
>  		i_end = buf_end;
> +		/* Trim zero bytes from i_end */
> +		while (i_end[-1] == 0)
> +			i_end--;
>  	}
>  	/* Trim any trailing spaces/tabs from i_end */
>  	while (spacetab(i_end[-1]))

  reply	other threads:[~2021-06-15 19:33 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-15 16:23 [PATCH] exec/binfmt_script: trip zero bytes from the buffer Andrei Vagin
2021-06-15 19:33 ` Eric W. Biederman [this message]
2021-06-15 22:35   ` Andrei Vagin
2021-06-21 19:27     ` Eric W. Biederman
2021-06-25  8:30       ` Andrei Vagin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=877diuq5xb.fsf@disp2133 \
    --to=ebiederm@xmission.com \
    --cc=avagin@gmail.com \
    --cc=keescook@chromium.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).