From: Mathieu Poirier <mathieu.poirier@linaro.org>
To: Mike Leach <mike.leach@linaro.org>
Cc: coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org,
suzuki.poulose@arm.com
Subject: Re: [PATCH 2/8] coresight: etm4x: Fix input validation for sysfs.
Date: Mon, 26 Aug 2019 16:29:12 -0600 [thread overview]
Message-ID: <20190826222912.GB24690@xps15> (raw)
In-Reply-To: <20190819205720.24457-3-mike.leach@linaro.org>
On Mon, Aug 19, 2019 at 09:57:14PM +0100, Mike Leach wrote:
> A number of issues are fixed relating to sysfs input validation:-
>
> 1) bb_ctrl_store() - incorrect compare of bit select field to absolute
> value. Reworked per ETMv4 specification.
> 2) seq_event_store() - incorrect mask value - register has two
> event values.
> 3) cyc_threshold_store() - must mask with max before checking min
> otherwise wrapped values can set illegal value below min.
> 4) res_ctrl_store() - update to mask off all res0 bits.
>
> Signed-off-by: Mike Leach <mike.leach@linaro.org>
> ---
> .../coresight/coresight-etm4x-sysfs.c | 21 ++++++++++++-------
> 1 file changed, 13 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c b/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c
> index b6984be0c515..fa1d6a938f6c 100644
> --- a/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c
> +++ b/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c
> @@ -652,10 +652,13 @@ static ssize_t cyc_threshold_store(struct device *dev,
>
> if (kstrtoul(buf, 16, &val))
> return -EINVAL;
> +
> + /* mask off max threshold before checking min value */
> + val &= ETM_CYC_THRESHOLD_MASK;
> if (val < drvdata->ccitmin)
> return -EINVAL;
>
> - config->ccctlr = val & ETM_CYC_THRESHOLD_MASK;
> + config->ccctlr = val;
> return size;
> }
> static DEVICE_ATTR_RW(cyc_threshold);
> @@ -686,14 +689,16 @@ static ssize_t bb_ctrl_store(struct device *dev,
> return -EINVAL;
> if (!drvdata->nr_addr_cmp)
> return -EINVAL;
> +
> /*
> - * Bit[7:0] selects which address range comparator is used for
> - * branch broadcast control.
> + * Bit[8] controls include(1) / exclude(0), bits[0-7] select
> + * individual range comparators. If include then at least 1
> + * range must be selected.
s/"must be selected"/"must be selected"
> */
> - if (BMVAL(val, 0, 7) > drvdata->nr_addr_cmp)
> + if ((val & BIT(8)) && (BMVAL(val, 0, 7) == 0))
> return -EINVAL;
>
> - config->bb_ctrl = val;
> + config->bb_ctrl = val & GENMASK(8, 0);
> return size;
> }
> static DEVICE_ATTR_RW(bb_ctrl);
> @@ -1324,8 +1329,8 @@ static ssize_t seq_event_store(struct device *dev,
>
> spin_lock(&drvdata->spinlock);
> idx = config->seq_idx;
> - /* RST, bits[7:0] */
> - config->seq_ctrl[idx] = val & 0xFF;
> + /* Seq control has two masks B[15:5] F[7:0] */
> + config->seq_ctrl[idx] = val & 0xFFFF;
> spin_unlock(&drvdata->spinlock);
> return size;
> }
> @@ -1580,7 +1585,7 @@ static ssize_t res_ctrl_store(struct device *dev,
> if (idx % 2 != 0)
> /* PAIRINV, bit[21] */
> val &= ~BIT(21);
> - config->res_ctrl[idx] = val;
> + config->res_ctrl[idx] = val & GENMASK(21, 0);
> spin_unlock(&drvdata->spinlock);
> return size;
> }
With the above:
Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
> --
> 2.17.1
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-08-26 22:29 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-19 20:57 [PATCH 0/8] coresight: etm4x: Fixes and updates for sysfs API Mike Leach
2019-08-19 20:57 ` [PATCH 1/8] coresight: etm4x: Fixes for ETM v4.4 architecture updates Mike Leach
2019-08-26 21:47 ` Mathieu Poirier
2019-08-27 10:12 ` Mike Leach
2019-08-27 19:19 ` Mathieu Poirier
2019-08-28 1:52 ` Leo Yan
2019-08-19 20:57 ` [PATCH 2/8] coresight: etm4x: Fix input validation for sysfs Mike Leach
2019-08-26 22:29 ` Mathieu Poirier [this message]
2019-08-28 2:42 ` Leo Yan
2019-08-19 20:57 ` [PATCH 3/8] coresight: etm4x: Add missing API to set EL match on address filters Mike Leach
2019-08-26 22:59 ` Mathieu Poirier
2019-08-27 10:55 ` Mike Leach
2019-08-27 17:57 ` Mathieu Poirier
2019-08-28 2:53 ` Leo Yan
2019-08-28 12:10 ` Mike Leach
2019-08-19 20:57 ` [PATCH 4/8] coresight: etm4x: Fix issues with start-stop logic Mike Leach
2019-08-28 3:17 ` Leo Yan
2019-08-28 12:40 ` Mike Leach
2019-08-19 20:57 ` [PATCH 5/8] coresight: etm4x: Improve usability of sysfs API Mike Leach
2019-08-27 21:35 ` Mathieu Poirier
2019-08-28 3:36 ` Leo Yan
2019-08-28 12:56 ` Mike Leach
2019-08-19 20:57 ` [PATCH 6/8] coresight: etm4x: Add view comparator settings API to sysfs Mike Leach
2019-08-27 21:40 ` Mathieu Poirier
2019-08-28 4:00 ` Leo Yan
2019-08-19 20:57 ` [PATCH 7/8] coresight: etm4x: Add missing single-shot control " Mike Leach
2019-08-27 22:27 ` Mathieu Poirier
2019-08-28 14:15 ` Mike Leach
2019-08-28 5:18 ` Leo Yan
2019-08-28 14:15 ` Mike Leach
2019-08-19 20:57 ` [PATCH 8/8] coresight: etm4x: docs: Additional documentation for ETM4x Mike Leach
2019-08-27 22:32 ` Mathieu Poirier
2019-08-27 22:34 ` Mathieu Poirier
2019-08-28 14:20 ` Mike Leach
2019-08-28 16:36 ` Mathieu Poirier
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=20190826222912.GB24690@xps15 \
--to=mathieu.poirier@linaro.org \
--cc=coresight@lists.linaro.org \
--cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).