From patchwork Tue Dec 11 10:22:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharat Masetty X-Patchwork-Id: 10723417 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 E36731751 for ; Tue, 11 Dec 2018 10:22:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D1CA32A2E4 for ; Tue, 11 Dec 2018 10:22:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C5E672A3B3; Tue, 11 Dec 2018 10:22:58 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6C01A2A392 for ; Tue, 11 Dec 2018 10:22:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726256AbeLKKW6 (ORCPT ); Tue, 11 Dec 2018 05:22:58 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:32956 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726227AbeLKKW5 (ORCPT ); Tue, 11 Dec 2018 05:22:57 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 39C0D60A31; Tue, 11 Dec 2018 10:22:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1544523777; bh=Tjei8e9TZHzwdcYAzLsqrCB/HEktrrVcLPT3ZJpCtT4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=In1XukzmB0t8MsicCELdKmf4Q89pnR0o+9VU2BakejRPg8nH3GFOpvUSFJajWFeqs U7CiFvTVwa4Yo5Y3dyCTX+C/+251KYL1Rphkpag6ybX+05bnyQcdGrepVoQklYnvV3 fj3TAT1+tZUUARSRv43nKm7aBtzhdbMtvEHotyUI= Received: from smasetty-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: smasetty@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id D655B601B4; Tue, 11 Dec 2018 10:22:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1544523776; bh=Tjei8e9TZHzwdcYAzLsqrCB/HEktrrVcLPT3ZJpCtT4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QPSS40VaS/ielOVPME0rcjYD10P0SYdw865FY5xzu0YVaK/kbxGIxq+j9oMqLACso ipj3Rm5RmvNloqBfc62wovkIUSR9raqvRQntyuds6tCdaJPxr2fnXK00YegZE5ShV9 QSVz8xxsJuXlMGO7o0yhOEeyfnaY/tOkmqF43Ejg= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org D655B601B4 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=smasetty@codeaurora.org From: Sharat Masetty To: freedreno@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, jcrouse@codeaurora.org, Sharat Masetty Subject: [v2 2/2] drm/msm/a6xx: Fix NULL dereference during crashstate capture Date: Tue, 11 Dec 2018 15:52:45 +0530 Message-Id: <1544523765-12786-2-git-send-email-smasetty@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1544523765-12786-1-git-send-email-smasetty@codeaurora.org> References: <1544523765-12786-1-git-send-email-smasetty@codeaurora.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The gpu crashstate's base objects registers pointer can be NULL if the target implementation decides to capture the register dump on its own. This patch simply checks for NULL before dereferencing. Signed-off-by: Sharat Masetty --- Changes from v1: Addressed comments from Jordan Crouse drivers/gpu/drm/msm/adreno/adreno_gpu.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- 1.9.1 diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index 40bcf32..56a63c4 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -415,6 +415,9 @@ void adreno_gpu_state_get(struct msm_gpu *gpu, struct msm_gpu_state *state) } } + if (!adreno_gpu->registers) + return; + /* Count the number of registers */ for (i = 0; adreno_gpu->registers[i] != ~0; i += 2) count += adreno_gpu->registers[i + 1] - @@ -550,9 +553,10 @@ void adreno_show(struct msm_gpu *gpu, struct msm_gpu_state *state, } } - drm_puts(p, "registers:\n"); - for (i = 0; i < state->nr_registers; i++) { + if (i == 0) + drm_puts(p, "registers:\n"); + drm_printf(p, " - { offset: 0x%04x, value: 0x%08x }\n", state->registers[i * 2] << 2, state->registers[(i * 2) + 1]);