mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com>
To: Jonas Gorski <jogo@openwrt.org>
Cc: MIPS Mailing List <linux-mips@linux-mips.org>,
	Markos Chandras <Markos.Chandras@imgtec.com>,
	Ralf Baechle <ralf@linux-mips.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] MIPS: R6: memcpy bugfix - zero length overwrites memory
Date: Tue, 28 Apr 2015 15:40:55 +0000	[thread overview]
Message-ID: <2t0ohi7dtgbcu7itm7j8br57.1430235652967@email.android.com> (raw)
In-Reply-To: <CAOiHx==LrOO26tPCxxh27bQ0b2a28LzvL054fQ6UVLFAvAOJYw@mail.gmail.com>

You right,

I am debugging new core and got a wrong backtrace.

Please cancel it, sorry for noise.

- Leonid.


Jonas Gorski <jogo@openwrt.org> wrote:


Hi,

On Tue, Apr 28, 2015 at 1:35 AM, Leonid Yegoshin
<Leonid.Yegoshin@imgtec.com> wrote:
> MIPS R6 version of memcpy has bug - then length to copy is zero
> and addresses are not aligned then it can overwrite a whole memory.
>
> Signed-off-by: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com>
> ---
>  arch/mips/lib/memcpy.S |    2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/arch/mips/lib/memcpy.S b/arch/mips/lib/memcpy.S
> index 9245e1705e69..7e0250f3aec8 100644
> --- a/arch/mips/lib/memcpy.S
> +++ b/arch/mips/lib/memcpy.S
> @@ -514,6 +514,8 @@
>
>  #ifdef CONFIG_CPU_MIPSR6
>  .Lcopy_unaligned_bytes\@:
> +       beqz    len, .Ldone\@
> +        nop
>  1:
>         COPY_BYTE(0)
>         COPY_BYTE(1)

AFAICT it should never reach that if the amount to copy is zero bytes,
so the check seems to be superfluous:

        sltu    t2, len, NBYTES <- check for < NBYTES (4/8 bit
depending on 32/64 bit)
        and     t1, dst, ADDRMASK
        PREFS(  0, 1*32(src) )
        PREFD(  1, 1*32(dst) )
        bnez    t2, .Lcopy_bytes_checklen\@ <- skip to
copy_bytes_checklen if < NBYTES
         and    t0, src, ADDRMASK
        PREFS(  0, 2*32(src) )
        PREFD(  1, 2*32(dst) )
#ifndef CONFIG_CPU_MIPSR6
        bnez    t1, .Ldst_unaligned\@
         nop
        bnez    t0, .Lsrc_unaligned_dst_aligned\@
#else
        or      t0, t0, t1
        bnez    t0, .Lcopy_unaligned_bytes\@ <- only outside place to
branch to it, and only reachable if len >= NBYTES bytes.
#endif


And in the loop itself each COPY_BYTE() will already break out if len
becomes zero, so the unconditional b 1b should also never be reached
with len == 0 in that case..

But maybe I overlooked something.


Regards
Jonas

      reply	other threads:[~2015-04-28 15:41 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-27 23:35 Leonid Yegoshin
2015-04-28 11:11 ` Jonas Gorski
2015-04-28 15:40   ` Leonid Yegoshin [this message]

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=2t0ohi7dtgbcu7itm7j8br57.1430235652967@email.android.com \
    --to=leonid.yegoshin@imgtec.com \
    --cc=Markos.Chandras@imgtec.com \
    --cc=jogo@openwrt.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mips@linux-mips.org \
    --cc=ralf@linux-mips.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

all inboxes | Powered by JetHome®