From: Kees Cook <keescook@chromium.org>
To: Chris Packham <chris.packham@alliedtelesis.co.nz>
Cc: re.emese@gmail.com, kernel-hardening@lists.openwall.com,
linux-kernel@vger.kernel.org,
Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: Re: [PATCH] gcc-plugins: arm_ssp_per_task_plugin: Fix for older GCC < 6
Date: Fri, 10 May 2019 13:23:24 -0700 [thread overview]
Message-ID: <201905101322.BEDE5CC@keescook> (raw)
In-Reply-To: <20190510090025.4680-1-chris.packham@alliedtelesis.co.nz>
On Fri, May 10, 2019 at 09:00:25PM +1200, Chris Packham wrote:
> Use gen_rtx_set instead of gen_rtx_SET. The former is a wrapper macro
> that handles the difference between GCC versions implementing
> the latter.
>
> This fixes the following error on my system with g++ 5.4.0 as the host
> compiler
>
> HOSTCXX -fPIC scripts/gcc-plugins/arm_ssp_per_task_plugin.o
> scripts/gcc-plugins/arm_ssp_per_task_plugin.c:42:14: error: macro "gen_rtx_SET" requires 3 arguments, but only 2 given
> mask)),
> ^
> scripts/gcc-plugins/arm_ssp_per_task_plugin.c: In function ‘unsigned int arm_pertask_ssp_rtl_execute()’:
> scripts/gcc-plugins/arm_ssp_per_task_plugin.c:39:20: error: ‘gen_rtx_SET’ was not declared in this scope
> emit_insn_before(gen_rtx_SET
>
> Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Thanks for this! It seems correct to me. Ard, any thoughts? I can send
it to Linus next week...
Fixes: 189af4657186 ("ARM: smp: add support for per-task stack canaries")
Cc: stable@vger.kernel.org
-Kees
> ---
> scripts/gcc-plugins/arm_ssp_per_task_plugin.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/gcc-plugins/arm_ssp_per_task_plugin.c b/scripts/gcc-plugins/arm_ssp_per_task_plugin.c
> index 89c47f57d1ce..8c1af9bdcb1b 100644
> --- a/scripts/gcc-plugins/arm_ssp_per_task_plugin.c
> +++ b/scripts/gcc-plugins/arm_ssp_per_task_plugin.c
> @@ -36,7 +36,7 @@ static unsigned int arm_pertask_ssp_rtl_execute(void)
> mask = GEN_INT(sext_hwi(sp_mask, GET_MODE_PRECISION(Pmode)));
> masked_sp = gen_reg_rtx(Pmode);
>
> - emit_insn_before(gen_rtx_SET(masked_sp,
> + emit_insn_before(gen_rtx_set(masked_sp,
> gen_rtx_AND(Pmode,
> stack_pointer_rtx,
> mask)),
> --
> 2.21.0
>
--
Kees Cook
next prev parent reply other threads:[~2019-05-10 20:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-10 9:00 [PATCH] gcc-plugins: arm_ssp_per_task_plugin: Fix for older GCC < 6 Chris Packham
2019-05-10 20:23 ` Kees Cook [this message]
2019-05-10 22:23 ` Doug Anderson
2019-05-16 8:47 ` Ard Biesheuvel
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=201905101322.BEDE5CC@keescook \
--to=keescook@chromium.org \
--cc=ard.biesheuvel@linaro.org \
--cc=chris.packham@alliedtelesis.co.nz \
--cc=kernel-hardening@lists.openwall.com \
--cc=linux-kernel@vger.kernel.org \
--cc=re.emese@gmail.com \
/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).