From: Mathieu Malaterre <malat@debian.org>
To: Michael Ellerman <mpe@ellerman.id.au>
Cc: linuxppc-dev@ozlabs.org, Meelis Roos <mroos@linux.ee>
Subject: Re: [PATCH] powerpc/ptrace: Simplify vr_get/set() to avoid GCC warning
Date: Fri, 15 Feb 2019 09:09:45 +0100 [thread overview]
Message-ID: <CA+7wUszvErrmyo9jAuPk0dtvwKd3cw4jSb04z5Q4DkGEjGiY7w@mail.gmail.com> (raw)
In-Reply-To: <20190215061400.20302-1-mpe@ellerman.id.au>
On Fri, Feb 15, 2019 at 7:14 AM Michael Ellerman <mpe@ellerman.id.au> wrote:
>
> GCC 8 warns about the logic in vr_get/set(), which with -Werror breaks
> the build:
>
> In function ‘user_regset_copyin’,
> inlined from ‘vr_set’ at arch/powerpc/kernel/ptrace.c:628:9:
> include/linux/regset.h:295:4: error: ‘memcpy’ offset [-527, -529] is
> out of the bounds [0, 16] of object ‘vrsave’ with type ‘union
> <anonymous>’ [-Werror=array-bounds]
> arch/powerpc/kernel/ptrace.c: In function ‘vr_set’:
> arch/powerpc/kernel/ptrace.c:623:5: note: ‘vrsave’ declared here
> } vrsave;
>
> This has been identified as a regression in GCC, see GCC bug 88273.
Good point, this does not seems this will be backported.
> However we can avoid the warning and also simplify the logic and make
> it more robust.
>
> Currently we pass -1 as end_pos to user_regset_copyout(). This says
> "copy up to the end of the regset".
>
> The definition of the regset is:
> [REGSET_VMX] = {
> .core_note_type = NT_PPC_VMX, .n = 34,
> .size = sizeof(vector128), .align = sizeof(vector128),
> .active = vr_active, .get = vr_get, .set = vr_set
> },
>
> The end is calculated as (n * size), ie. 34 * sizeof(vector128).
>
> In vr_get/set() we pass start_pos as 33 * sizeof(vector128), meaning
> we can copy up to sizeof(vector128) into/out-of vrsave.
>
> The on-stack vrsave is defined as:
> union {
> elf_vrreg_t reg;
> u32 word;
> } vrsave;
>
> And elf_vrreg_t is:
> typedef __vector128 elf_vrreg_t;
>
> So there is no bug, but we rely on all those sizes lining up,
> otherwise we would have a kernel stack exposure/overwrite on our
> hands.
>
> Rather than relying on that we can pass an explict end_pos based on
> the sizeof(vrsave). The result should be exactly the same but it's
> more obviously not over-reading/writing the stack and it avoids the
> compiler warning.
>
maybe:
Link: https://lkml.org/lkml/2018/8/16/117
In any case the warning is now gone:
Tested-by: Mathieu Malaterre <malat@debian.org>
> Reported-by: Meelis Roos <mroos@linux.ee>
> Reported-by: Mathieu Malaterre <malat@debian.org>
> Cc: stable@vger.kernel.org
> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
> ---
> arch/powerpc/kernel/ptrace.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
> index 7535f89e08cd..d9ac7d94656e 100644
> --- a/arch/powerpc/kernel/ptrace.c
> +++ b/arch/powerpc/kernel/ptrace.c
> @@ -567,6 +567,7 @@ static int vr_get(struct task_struct *target, const struct user_regset *regset,
> /*
> * Copy out only the low-order word of vrsave.
> */
> + int start, end;
> union {
> elf_vrreg_t reg;
> u32 word;
> @@ -575,8 +576,10 @@ static int vr_get(struct task_struct *target, const struct user_regset *regset,
>
> vrsave.word = target->thread.vrsave;
>
> + start = 33 * sizeof(vector128);
> + end = start + sizeof(vrsave);
> ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf, &vrsave,
> - 33 * sizeof(vector128), -1);
> + start, end);
> }
>
> return ret;
> @@ -614,6 +617,7 @@ static int vr_set(struct task_struct *target, const struct user_regset *regset,
> /*
> * We use only the first word of vrsave.
> */
> + int start, end;
> union {
> elf_vrreg_t reg;
> u32 word;
> @@ -622,8 +626,10 @@ static int vr_set(struct task_struct *target, const struct user_regset *regset,
>
> vrsave.word = target->thread.vrsave;
>
> + start = 33 * sizeof(vector128);
> + end = start + sizeof(vrsave);
> ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, &vrsave,
> - 33 * sizeof(vector128), -1);
> + start, end);
> if (!ret)
> target->thread.vrsave = vrsave.word;
> }
> --
> 2.20.1
>
next prev parent reply other threads:[~2019-02-15 8:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-15 6:14 [PATCH] powerpc/ptrace: Simplify vr_get/set() to avoid GCC warning Michael Ellerman
2019-02-15 8:09 ` Mathieu Malaterre [this message]
2019-02-15 9:20 ` Michael Ellerman
2019-02-16 19:15 ` Meelis Roos
2019-02-19 1:02 ` Michael Ellerman
2019-02-22 9:47 ` Michael Ellerman
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=CA+7wUszvErrmyo9jAuPk0dtvwKd3cw4jSb04z5Q4DkGEjGiY7w@mail.gmail.com \
--to=malat@debian.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=mroos@linux.ee \
/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).