Skip to content

Commit f3b8172

Browse files
Suzuki K Poulosegregkh
authored andcommitted
coresight: Fix erroneous memset in tmc_read_unprepare_etr
At the end of a trace collection, we try to clear the entire buffer and enable the ETR back if it was already enabled. But, we would have adjusted the drvdata->buf to point to the beginning of the trace data in the trace buffer @drvdata->vaddr. So, the following code which clears the buffer is dangerous and can cause crashes, like below : memset(drvdata->buf, 0, drvdata->size); Unable to handle kernel paging request at virtual address ffffff800a145000 pgd = ffffffc974726000 *pgd=00000009f3e91003, *pud=00000009f3e91003, *pmd=0000000000000000 PREEMPT SMP Modules linked in: CPU: 4 PID: 1692 Comm: dd Not tainted 4.7.0-rc2+ #1721 Hardware name: ARM Juno development board (r0) (DT) task: ffffffc9734a0080 ti: ffffffc974460000 task.ti: ffffffc974460000 PC is at __memset+0x1ac/0x200 LR is at tmc_read_unprepare_etr+0x144/0x1bc pc : [<ffffff80083a05ac>] lr : [<ffffff800859c984>] pstate: 200001c5 ... [<ffffff80083a05ac>] __memset+0x1ac/0x200 [<ffffff800859b2e4>] tmc_release+0x90/0x94 [<ffffff8008202f58>] __fput+0xa8/0x1ec [<ffffff80082030f4>] ____fput+0xc/0x14 [<ffffff80080c3ef8>] task_work_run+0xb0/0xe4 [<ffffff8008088bf4>] do_notify_resume+0x64/0x6c [<ffffff8008084d5c>] work_pending+0x10/0x14 Code: 91010108 54ffff4a 8b040108 cb050042 (d50b7428) Since we clear the buffer anyway in the following call to tmc_etr_enable_hw(), remove the erroneous memset(). Fixes: commit de54619 ("coresight: tmc: allocating memory when needed") Cc: Mathieu Poirier <[email protected]> Signed-off-by: Suzuki K Poulose <[email protected]> Signed-off-by: Mathieu Poirier <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 8e21529 commit f3b8172

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

drivers/hwtracing/coresight/coresight-tmc-etr.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -300,13 +300,10 @@ int tmc_read_unprepare_etr(struct tmc_drvdata *drvdata)
300300
if (local_read(&drvdata->mode) == CS_MODE_SYSFS) {
301301
/*
302302
* The trace run will continue with the same allocated trace
303-
* buffer. As such zero-out the buffer so that we don't end
304-
* up with stale data.
305-
*
306-
* Since the tracer is still enabled drvdata::buf
307-
* can't be NULL.
303+
* buffer. The trace buffer is cleared in tmc_etr_enable_hw(),
304+
* so we don't have to explicitly clear it. Also, since the
305+
* tracer is still enabled drvdata::buf can't be NULL.
308306
*/
309-
memset(drvdata->buf, 0, drvdata->size);
310307
tmc_etr_enable_hw(drvdata);
311308
} else {
312309
/*

0 commit comments

Comments
 (0)