From patchwork Thu Mar 7 01:28:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhinav Kumar X-Patchwork-Id: 10842139 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6EF601515 for ; Thu, 7 Mar 2019 01:29:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5CE102E0A5 for ; Thu, 7 Mar 2019 01:29:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4FACE2E0AC; Thu, 7 Mar 2019 01:29:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0BDC62E0A5 for ; Thu, 7 Mar 2019 01:29:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5831D6E221; Thu, 7 Mar 2019 01:29:02 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from smtp.codeaurora.org (smtp.codeaurora.org [198.145.29.96]) by gabe.freedesktop.org (Postfix) with ESMTPS id A9D796E221 for ; Thu, 7 Mar 2019 01:29:01 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 73C8460790; Thu, 7 Mar 2019 01:29:01 +0000 (UTC) Received: from abhinavk-linux.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: abhinavk@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 3B97A60790; Thu, 7 Mar 2019 01:29:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 3B97A60790 From: Abhinav Kumar To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/msm/dsi: add protection against NULL dsi device Date: Wed, 6 Mar 2019 17:28:54 -0800 Message-Id: <1551922134-22518-1-git-send-email-abhinavk@codeaurora.org> X-Mailer: git-send-email 1.9.1 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1551922141; bh=+XsyUUM2MVcCFqZBWlA9RZRu6+nIa1emMpyxrkQ9XcM=; h=From:To:Cc:Subject:Date:From; b=YBRJ+X9nWbkFOdOKV64EK7iQcnNYuYH0Ass8csvvsr/xUtAijkPFqKPBFN4tzHgD7 WF3LrZ5ka9MXMNAvWpfRAR5jzdzoqZbkhXeuxPPq/Kt/py2NiGDv1VJWLDR+57Da+p wzIiihwt9KZgZ3klSWvcse+d3XFoOHR/4ggawaLA= X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1551922140; bh=+XsyUUM2MVcCFqZBWlA9RZRu6+nIa1emMpyxrkQ9XcM=; h=From:To:Cc:Subject:Date:From; b=P4eWxwPPDnu39/JykXeQrd+lCw5cEbdzPwgBRB4voQ29qXMjN/i+pFRYeaHKT5fes 9cuwyr0zi6QVe7dpgQ/KbGkKfQ+g8tDzVOiajPpfHcVy7y2vl2gu5gXGt8A+OkYFCz BIJHjgG1kN3ln13cWEl5/N18IUd+F6yF1/tL5xbE= X-Mailman-Original-Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org X-Mailman-Original-Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=abhinavk@codeaurora.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jhugo@codeaurora.org, linux-arm-msm@vger.kernel.org, Abhinav Kumar , seanpaul@chromium.org, hoegsberg@google.com, sean@poorly.run, chandanu@codeaurora.org MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP When panel probe happens after DSI probe, the DSI probe is deferred as per current design. In the probe defer path dsi device is destroyed. This NULL dsi device could be deferenced by the panel probe in the mipi_dsi_attach path. Check for NULL dsi device before accessing it. Reported-by: Jeffrey Hugo Tested-by: Jeffrey Hugo Signed-off-by: Abhinav Kumar --- drivers/gpu/drm/msm/dsi/dsi_manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c index 80aa634..cc2569d 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_manager.c +++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c @@ -769,7 +769,7 @@ bool msm_dsi_manager_cmd_xfer_trigger(int id, u32 dma_base, u32 len) void msm_dsi_manager_attach_dsi_device(int id, u32 device_flags) { struct msm_dsi *msm_dsi = dsi_mgr_get_dsi(id); - struct drm_device *dev = msm_dsi->dev; + struct drm_device *dev = msm_dsi ? msm_dsi->dev : NULL; struct msm_drm_private *priv; struct msm_kms *kms; struct drm_encoder *encoder;