From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.7 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6881AC31E45 for ; Thu, 13 Jun 2019 15:55:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3CF1920851 for ; Thu, 13 Jun 2019 15:55:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560441334; bh=CB7xnMfGQghiPEoa7Avn67rxvZbJsKlGhvbDQdoi0uA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=05w7J9/fF3NI+77OhzdC/Il+qhpDVrEFr2Z0bx7pXkWupWJQ6Q9l/hTxazxYOyrr+ RBvuwt6AWMQm0/KU9ZQu/ZOKaUmIWkhp3rLkEMVGNm9LAz9O/i/9hhdIVcvayBQcwL IaLyYyYK5ewNG9k9HNgdQ3SoauHXpxw4TwGILKcc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390187AbfFMPzd (ORCPT ); Thu, 13 Jun 2019 11:55:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:39186 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731540AbfFMIvv (ORCPT ); Thu, 13 Jun 2019 04:51:51 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1E51721744; Thu, 13 Jun 2019 08:51:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560415910; bh=CB7xnMfGQghiPEoa7Avn67rxvZbJsKlGhvbDQdoi0uA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uiKPr6wiCNi5vuB6vc8fi1VdSmNCMORY2eNf8EYrXeP4LASUcBbMunP7Az+X7lIUZ AkHMa6UgwumjB1VifyEOxrZ3GPrqbK6vqwLdDVxmzvPo17ejhF0L13nEUInM+0A7+s 0pP6HITKcaJIr6xnjLbfNLbF3dFS+HVJgfhKHdLk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Brian Masney , Sean Paul , Sasha Levin Subject: [PATCH 5.1 008/155] drm/msm: correct attempted NULL pointer dereference in debugfs Date: Thu, 13 Jun 2019 10:32:00 +0200 Message-Id: <20190613075653.209291319@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190613075652.691765927@linuxfoundation.org> References: <20190613075652.691765927@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 90f94660e53189755676543954101de78c26253b ] msm_gem_describe() would attempt to dereference a NULL pointer via the address space pointer when no IOMMU is present. Correct this by adding the appropriate check. Signed-off-by: Brian Masney Fixes: 575f0485508b ("drm/msm: Clean up and enhance the output of the 'gem' debugfs node") Signed-off-by: Sean Paul Link: https://patchwork.freedesktop.org/patch/msgid/20190513234105.7531-2-masneyb@onstation.org Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/msm_gem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 18ca651ab942..23de4d1b7b1a 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -805,7 +805,8 @@ void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m) seq_puts(m, " vmas:"); list_for_each_entry(vma, &msm_obj->vmas, list) - seq_printf(m, " [%s: %08llx,%s,inuse=%d]", vma->aspace->name, + seq_printf(m, " [%s: %08llx,%s,inuse=%d]", + vma->aspace != NULL ? vma->aspace->name : NULL, vma->iova, vma->mapped ? "mapped" : "unmapped", vma->inuse); -- 2.20.1