From: wcohen@redhat.com (William Cohen)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: kprobes: Fix false positive with FORTIFY_SOURCE
Date: Tue, 30 Oct 2018 13:40:27 -0400 [thread overview]
Message-ID: <cbeccaf1-33ec-0e54-0cfa-8cff81bbc1cd@redhat.com> (raw)
In-Reply-To: <20181022093023.GA8920@beast>
On 10/22/18 5:30 AM, Kees Cook wrote:
> The arm compiler internally interprets an inline assembly label
> as an unsigned long value, not a pointer. As a result, under
> CONFIG_FORTIFY_SOURCE, the size of the array pointed to by an address
> of a label is 4 bytes, which was tripping the runtime checks. Instead,
> we can just cast the label (as done with the size calculations earlier)
> to avoid the problem.
>
> Reported-by: William Cohen <wcohen@redhat.com>
> Fixes: 6974f0c4555e ("include/linux/string.h: add the option of fortified string.h functions")
> Cc: stable at vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---
> arch/arm/probes/kprobes/opt-arm.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/probes/kprobes/opt-arm.c b/arch/arm/probes/kprobes/opt-arm.c
> index b2aa9b32bff2..2c118a6ab358 100644
> --- a/arch/arm/probes/kprobes/opt-arm.c
> +++ b/arch/arm/probes/kprobes/opt-arm.c
> @@ -247,7 +247,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op, struct kprobe *or
> }
>
> /* Copy arch-dep-instance from template. */
> - memcpy(code, &optprobe_template_entry,
> + memcpy(code, (unsigned char *)optprobe_template_entry,
> TMPL_END_IDX * sizeof(kprobe_opcode_t));
>
> /* Adjust buffer according to instruction. */
>
The patch fixes the issue for kretprobes. It looks good to me.
Thanks,
-Will
WARNING: multiple messages have this Message-ID (diff)
From: William Cohen <wcohen@redhat.com>
To: Kees Cook <keescook@chromium.org>, Russell King <linux@armlinux.org.uk>
Cc: Laura Abbott <labbott@redhat.com>,
linux-kernel@vger.kernel.org,
Masami Hiramatsu <mhiramat@kernel.org>,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH] ARM: kprobes: Fix false positive with FORTIFY_SOURCE
Date: Tue, 30 Oct 2018 13:40:27 -0400 [thread overview]
Message-ID: <cbeccaf1-33ec-0e54-0cfa-8cff81bbc1cd@redhat.com> (raw)
In-Reply-To: <20181022093023.GA8920@beast>
On 10/22/18 5:30 AM, Kees Cook wrote:
> The arm compiler internally interprets an inline assembly label
> as an unsigned long value, not a pointer. As a result, under
> CONFIG_FORTIFY_SOURCE, the size of the array pointed to by an address
> of a label is 4 bytes, which was tripping the runtime checks. Instead,
> we can just cast the label (as done with the size calculations earlier)
> to avoid the problem.
>
> Reported-by: William Cohen <wcohen@redhat.com>
> Fixes: 6974f0c4555e ("include/linux/string.h: add the option of fortified string.h functions")
> Cc: stable@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---
> arch/arm/probes/kprobes/opt-arm.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/probes/kprobes/opt-arm.c b/arch/arm/probes/kprobes/opt-arm.c
> index b2aa9b32bff2..2c118a6ab358 100644
> --- a/arch/arm/probes/kprobes/opt-arm.c
> +++ b/arch/arm/probes/kprobes/opt-arm.c
> @@ -247,7 +247,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op, struct kprobe *or
> }
>
> /* Copy arch-dep-instance from template. */
> - memcpy(code, &optprobe_template_entry,
> + memcpy(code, (unsigned char *)optprobe_template_entry,
> TMPL_END_IDX * sizeof(kprobe_opcode_t));
>
> /* Adjust buffer according to instruction. */
>
The patch fixes the issue for kretprobes. It looks good to me.
Thanks,
-Will
next prev parent reply other threads:[~2018-10-30 17:40 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-22 9:30 [PATCH] ARM: kprobes: Fix false positive with FORTIFY_SOURCE Kees Cook
2018-10-22 9:30 ` Kees Cook
2018-10-22 10:30 ` Laura Abbott
2018-10-22 10:30 ` Laura Abbott
2018-10-23 1:06 ` Masami Hiramatsu
2018-10-23 1:06 ` Masami Hiramatsu
2018-10-30 17:40 ` William Cohen [this message]
2018-10-30 17:40 ` William Cohen
2018-11-01 14:41 ` Masami Hiramatsu
2018-11-01 14:41 ` Masami Hiramatsu
2018-11-01 20:53 ` Kees Cook
2018-11-01 20:53 ` Kees Cook
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=cbeccaf1-33ec-0e54-0cfa-8cff81bbc1cd@redhat.com \
--to=wcohen@redhat.com \
--cc=linux-arm-kernel@lists.infradead.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.