From: Mathieu Poirier <mathieu.poirier@linaro.org>
To: Mike Leach <mike.leach@linaro.org>
Cc: linux-arm-kernel@lists.infradead.org, coresight@lists.linaro.org,
linux-kernel@vger.kernel.org, suzuki.poulose@arm.com,
alexander.shishkin@linux.intel.com, lcherian@marvell.com
Subject: Re: [PATCH] coresight: Fix uninitialised pointer bug in etm_setup_aux()
Date: Thu, 29 Oct 2020 10:30:17 -0600 [thread overview]
Message-ID: <20201029163017.GA1267404@xps15> (raw)
In-Reply-To: <20201028174301.15033-1-mike.leach@linaro.org>
On Wed, Oct 28, 2020 at 05:43:01PM +0000, Mike Leach wrote:
> Commit [bb1860efc817] changed the sink handling code introducing an
> uninitialised pointer bug. This results in the default sink selection
> failing.
>
> Prior to commit:
>
> static void etm_setup_aux(...)
>
> <snip>
> struct coresight_device *sink;
> <snip>
>
> /* First get the selected sink from user space. */
> if (event->attr.config2) {
> id = (u32)event->attr.config2;
> sink = coresight_get_sink_by_id(id);
> } else {
> sink = coresight_get_enabled_sink(true);
> }
> <ctd>
>
> *sink always initialised - possibly to NULL which triggers the
> automatic sink selection.
>
> After commit:
>
> static void etm_setup_aux(...)
>
> <snip>
> struct coresight_device *sink;
> <snip>
>
> /* First get the selected sink from user space. */
> if (event->attr.config2) {
> id = (u32)event->attr.config2;
> sink = coresight_get_sink_by_id(id);
> }
> <ctd>
>
> *sink pointer uninitialised when not providing a sink on the perf command
> line. This breaks later checks to enable automatic sink selection.
>
> Fixes [bb1860efc817] ("coresight: etm: perf: Sink selection using sysfs is deprecated")
> Signed-off-by: Mike Leach <mike.leach@linaro.org>
> ---
> drivers/hwtracing/coresight/coresight-etm-perf.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c
> index c2c9b127d074..bdc34ca449f7 100644
> --- a/drivers/hwtracing/coresight/coresight-etm-perf.c
> +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c
> @@ -210,7 +210,7 @@ static void *etm_setup_aux(struct perf_event *event, void **pages,
> u32 id;
> int cpu = event->cpu;
> cpumask_t *mask;
> - struct coresight_device *sink;
> + struct coresight_device *sink = NULL;
Yes, obviously - thanks for catching that.
As checkpatch has complained about, the Fixes line you added isn't correct. It
should have been:
Fixes: bb1860efc817 ("coresight: etm: perf: Sink selection using sysfs is deprecated")
I made the modification and applied to my tree.
Thanks,
Mathieu
> struct etm_event_data *event_data = NULL;
>
> event_data = alloc_event_data(cpu);
> --
> 2.17.1
>
prev parent reply other threads:[~2020-10-29 16:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-28 17:43 [PATCH] coresight: Fix uninitialised pointer bug in etm_setup_aux() Mike Leach
2020-10-29 16:30 ` Mathieu Poirier [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=20201029163017.GA1267404@xps15 \
--to=mathieu.poirier@linaro.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=coresight@lists.linaro.org \
--cc=lcherian@marvell.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mike.leach@linaro.org \
--cc=suzuki.poulose@arm.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