From: Alexander Shishkin <alexander.shishkin@linux.intel.com>
To: Greg KH <greg@kroah.com>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>,
Chunyan Zhang <zhang.chunyan@linaro.org>,
laurent.fert@intel.com, yann.fouassier@intel.com,
linux-kernel@vger.kernel.org,
Alexander Shishkin <alexander.shishkin@linux.intel.com>
Subject: [QUEUED v20160212 07/19] intel_th: sth: Sanitize packet callback's return values
Date: Fri, 12 Feb 2016 19:00:23 +0200 [thread overview]
Message-ID: <1455296435-17362-8-git-send-email-alexander.shishkin@linux.intel.com> (raw)
In-Reply-To: <1455296435-17362-1-git-send-email-alexander.shishkin@linux.intel.com>
According to the stm class interface, the packet callback should return
an error if it is asked to generate packets that it doesn't support.
When it succeeds, it should return number of bytes consumed from its
payload. Currently, for FLAG packet it mistakenly returns 1.
This patch addresses these issues.
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
---
drivers/hwtracing/intel_th/sth.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/hwtracing/intel_th/sth.c b/drivers/hwtracing/intel_th/sth.c
index 56101c33e1..e1aee61dd7 100644
--- a/drivers/hwtracing/intel_th/sth.c
+++ b/drivers/hwtracing/intel_th/sth.c
@@ -94,10 +94,13 @@ static ssize_t sth_stm_packet(struct stm_data *stm_data, unsigned int master,
case STP_PACKET_TRIG:
if (flags & STP_PACKET_TIMESTAMPED)
reg += 4;
- iowrite8(*payload, sth->base + reg);
+ writeb_relaxed(*payload, sth->base + reg);
break;
case STP_PACKET_MERR:
+ if (size > 4)
+ size = 4;
+
sth_iowrite(&out->MERR, payload, size);
break;
@@ -107,8 +110,8 @@ static ssize_t sth_stm_packet(struct stm_data *stm_data, unsigned int master,
else
outp = (u64 __iomem *)&out->FLAG;
- size = 1;
- sth_iowrite(outp, payload, size);
+ size = 0;
+ writeb_relaxed(0, outp);
break;
case STP_PACKET_USER:
@@ -129,6 +132,8 @@ static ssize_t sth_stm_packet(struct stm_data *stm_data, unsigned int master,
sth_iowrite(outp, payload, size);
break;
+ default:
+ return -ENOTSUPP;
}
return size;
--
2.7.0
next prev parent reply other threads:[~2016-02-12 17:05 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-12 17:00 [QUEUED v20160212 00/19] stm class/intel_th: Patches in my queue Alexander Shishkin
2016-02-12 17:00 ` [QUEUED v20160212 01/19] stm class: Use a signed return type for stm_find_master_chan Alexander Shishkin
2016-02-12 17:00 ` [QUEUED v20160212 02/19] intel_th: Depend on HAS_IOMEM Alexander Shishkin
2016-02-12 17:00 ` [QUEUED v20160212 03/19] intel_th: gth: Remove commented-out code Alexander Shishkin
2016-02-12 17:00 ` [QUEUED v20160212 04/19] intel_th: Update scratchpad bits according to enabled output activity Alexander Shishkin
2016-02-12 17:00 ` [QUEUED v20160212 05/19] intel_th: msu: Fix offset for wrapped block Alexander Shishkin
2016-02-12 17:00 ` [QUEUED v20160212 06/19] intel_th: msu: Release resources on read error Alexander Shishkin
2016-02-12 17:00 ` Alexander Shishkin [this message]
2016-02-12 17:00 ` [QUEUED v20160212 08/19] intel_th: Set root device's drvdata early Alexander Shishkin
2016-02-12 17:00 ` [QUEUED v20160212 09/19] intel_th: Use real device index in the node names Alexander Shishkin
2016-02-12 17:00 ` [QUEUED v20160212 10/19] stm class: Use driver's packet callback return value Alexander Shishkin
2016-02-12 17:00 ` [QUEUED v20160212 11/19] stm class: Support devices with multiple instances Alexander Shishkin
2016-02-12 17:00 ` [QUEUED v20160212 12/19] stm class: dummy_stm: Create multiple devices Alexander Shishkin
2016-02-12 17:00 ` [QUEUED v20160212 13/19] stm class: Add heartbeat stm source device Alexander Shishkin
2016-02-12 17:00 ` [QUEUED v20160212 14/19] stm class: Fix unlocking braino in the error path Alexander Shishkin
2016-02-12 17:00 ` [QUEUED v20160212 15/19] stm class: Guard output assignment against concurrency Alexander Shishkin
2016-02-12 17:00 ` [QUEUED v20160212 16/19] stm class: Fix unbalanced module/device refcounting Alexander Shishkin
2016-02-12 17:00 ` [QUEUED v20160212 17/19] stm class: Fix a race in unlinking Alexander Shishkin
2016-02-12 17:00 ` [QUEUED v20160212 18/19] stm class: Plug stm device's unlink callback Alexander Shishkin
2016-02-12 17:00 ` [QUEUED v20160212 19/19] stm class: dummy_stm: Add link callback for fault injection Alexander Shishkin
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=1455296435-17362-8-git-send-email-alexander.shishkin@linux.intel.com \
--to=alexander.shishkin@linux.intel.com \
--cc=greg@kroah.com \
--cc=laurent.fert@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.poirier@linaro.org \
--cc=yann.fouassier@intel.com \
--cc=zhang.chunyan@linaro.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 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®