From: James Clark <james.clark@linaro.org>
To: Jie Gan <jie.gan@oss.qualcomm.com>
Cc: coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Mike Leach <mike.leach@arm.com>, Leo Yan <leo.yan@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Tingwei Zhang <tingwei.zhang@oss.qualcomm.com>
Subject: Re: [PATCH] coresight: platform: defer connection counter increment until alloc succeeds
Date: Tue, 19 May 2026 13:46:16 +0100 [thread overview]
Message-ID: <6925146f-7250-40be-908d-9a210472654f@linaro.org> (raw)
In-Reply-To: <20260511-fix-ref-count-issue-v1-1-99d647810d3c@oss.qualcomm.com>
On 11/05/2026 5:19 am, Jie Gan wrote:
> coresight_add_out_conn() increments nr_outconns before calling
> devm_krealloc_array() and again before devm_kmalloc(). If either
> allocation fails, the counter is already bumped while the corresponding
> array entry is NULL or uninitialized garbage.
>
> coresight_add_in_conn() has the same problem with nr_inconns and
> devm_krealloc_array().
>
> In both cases the probe returns -ENOMEM, which causes
> coresight_get_platform_data() to call coresight_release_platform_data()
> for cleanup. That function iterates up to nr_outconns (or nr_inconns)
> entries and dereferences each pointer unconditionally, hitting the NULL
> or garbage entry and panicking instead of failing gracefully.
>
> Fix by moving the counter increments to after all allocations succeed,
> so the struct is always consistent on any error path.
>
> Fixes: 3d4ff657e454 ("coresight: Dynamically add connections")
> Fixes: e3f4e68797a9 ("coresight: Store in-connections as well as out-connections")
> Signed-off-by: Jie Gan <jie.gan@oss.qualcomm.com>
Reviewed-by: James Clark <james.clark@linaro.org>
> ---
> drivers/hwtracing/coresight/coresight-platform.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/hwtracing/coresight/coresight-platform.c b/drivers/hwtracing/coresight/coresight-platform.c
> index e337b6e2bf32..93c2d075cad6 100644
> --- a/drivers/hwtracing/coresight/coresight-platform.c
> +++ b/drivers/hwtracing/coresight/coresight-platform.c
> @@ -45,9 +45,8 @@ coresight_add_out_conn(struct device *dev,
> }
> }
>
> - pdata->nr_outconns++;
> pdata->out_conns =
> - devm_krealloc_array(dev, pdata->out_conns, pdata->nr_outconns,
> + devm_krealloc_array(dev, pdata->out_conns, pdata->nr_outconns + 1,
> sizeof(*pdata->out_conns), GFP_KERNEL);
> if (!pdata->out_conns)
> return ERR_PTR(-ENOMEM);
> @@ -63,7 +62,8 @@ coresight_add_out_conn(struct device *dev,
> * used right away.
> */
> *conn = *new_conn;
> - pdata->out_conns[pdata->nr_outconns - 1] = conn;
> + pdata->out_conns[pdata->nr_outconns] = conn;
> + pdata->nr_outconns++;
> return conn;
> }
> EXPORT_SYMBOL_GPL(coresight_add_out_conn);
> @@ -86,13 +86,13 @@ int coresight_add_in_conn(struct coresight_connection *out_conn)
> return 0;
> }
>
> - pdata->nr_inconns++;
> pdata->in_conns =
> - devm_krealloc_array(dev, pdata->in_conns, pdata->nr_inconns,
> + devm_krealloc_array(dev, pdata->in_conns, pdata->nr_inconns + 1,
> sizeof(*pdata->in_conns), GFP_KERNEL);
> if (!pdata->in_conns)
> return -ENOMEM;
> - pdata->in_conns[pdata->nr_inconns - 1] = out_conn;
> + pdata->in_conns[pdata->nr_inconns] = out_conn;
> + pdata->nr_inconns++;
> return 0;
> }
> EXPORT_SYMBOL_GPL(coresight_add_in_conn);
>
> ---
> base-commit: e98d21c170b01ddef366f023bbfcf6b31509fa83
> change-id: 20260511-fix-ref-count-issue-7c44ce39700f
>
> Best regards,
next prev parent reply other threads:[~2026-05-19 12:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-11 4:19 Jie Gan
2026-05-19 12:46 ` James Clark [this message]
2026-05-29 10:02 ` Suzuki K Poulose
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=6925146f-7250-40be-908d-9a210472654f@linaro.org \
--to=james.clark@linaro.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=coresight@lists.linaro.org \
--cc=jie.gan@oss.qualcomm.com \
--cc=leo.yan@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mike.leach@arm.com \
--cc=suzuki.poulose@arm.com \
--cc=tingwei.zhang@oss.qualcomm.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
all inboxes | Powered by JetHome®