From e97e4f01dd3ee24ca9640fdc4b1e4213f3e306b4 Mon Sep 17 00:00:00 2001 From: Tao Zhang Date: Wed, 19 May 2021 14:31:20 +0800 Subject: [PATCH] coresight: byte-cntr: Add ETR status check in bypass notifier Add ETR status check while receiving USB_QDSS_CONNECT event. Otherwise, there will cause crash due to NULL pointer issue. Since ETR buffer will be released if ETR is disabled. Change-Id: I358d25477c938844df5bff5c29ddbee307b770e3 Signed-off-by: Tao Zhang --- drivers/hwtracing/coresight/coresight-byte-cntr.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/hwtracing/coresight/coresight-byte-cntr.c b/drivers/hwtracing/coresight/coresight-byte-cntr.c index 3ce6d1e99c12..7a785ed2e65d 100644 --- a/drivers/hwtracing/coresight/coresight-byte-cntr.c +++ b/drivers/hwtracing/coresight/coresight-byte-cntr.c @@ -630,6 +630,11 @@ void usb_bypass_notifier(void *priv, unsigned int event, switch (event) { case USB_QDSS_CONNECT: + if (tmcdrvdata->mode == CS_MODE_DISABLED) { + dev_err_ratelimited(&tmcdrvdata->csdev->dev, + "%s: ETR is disabled.\n", __func__); + return; + } ret = usb_bypass_start(drvdata); if (ret < 0) return;