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=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 974E2C04E53 for ; Wed, 15 May 2019 11:18:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 695BC206BF for ; Wed, 15 May 2019 11:18:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557919110; bh=jjRElJ+4KvTzOVhPURmM6wWAWQNChEvRFpKFGG/w1xM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=WbQe9+ILUGOlsFqOHdQ8h9GIrFxFgjxgqNMkCLBL8O2bc1T1D3C7dsy7zkge04jXM PI4v+Sl0z1xXms/vC4SEUj9As1ois/K9gSbE86P+b71M5A0gDpblCBSP8Cn9nndkqI 4srcIBLc+SH0wmHOzoxpBGBw9RdYPUI50g4USkII= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730804AbfEOLS3 (ORCPT ); Wed, 15 May 2019 07:18:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:55888 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728176AbfEOLS1 (ORCPT ); Wed, 15 May 2019 07:18:27 -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 C7066206BF; Wed, 15 May 2019 11:18:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557919106; bh=jjRElJ+4KvTzOVhPURmM6wWAWQNChEvRFpKFGG/w1xM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BrFjlSfDvFkhDFxw4t+H/VUZgKkqdILyTKsqKSyix3t/jY221f4lo4RoFFE+y9Wcs pbAamiyIU8TjpPZy2CZiqbZBYqXsNdFGCiHSRAq8fm89NTmIPtc6yJIJ89bOfbUM6q /JmNwZ8MBVSSkNxlfU1/+3JSBwoP6vCVl3/cpSQE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Enric Balletbo i Serra , Heiko Stuebner , Sasha Levin Subject: [PATCH 4.14 070/115] drm/rockchip: psr: do not dereference encoder before it is null checked. Date: Wed, 15 May 2019 12:55:50 +0200 Message-Id: <20190515090704.563089521@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090659.123121100@linuxfoundation.org> References: <20190515090659.123121100@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 4eda776c3cefcb1f01b2d85bd8753f67606282b5 ] 'encoder' is dereferenced before it is null sanity checked, hence we potentially have a null pointer dereference bug. Instead, initialise drm_drv from encoder->dev->dev_private after we are sure 'encoder' is not null. Fixes: 5182c1a556d7f ("drm/rockchip: add an common abstracted PSR driver") Cc: stable@vger.kernel.org Signed-off-by: Enric Balletbo i Serra Signed-off-by: Heiko Stuebner Link: https://patchwork.freedesktop.org/patch/msgid/20181013105654.11827-1-enric.balletbo@collabora.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/rockchip/rockchip_drm_psr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_psr.c b/drivers/gpu/drm/rockchip/rockchip_drm_psr.c index a553e182ff538..32e7dba2bf5ea 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_psr.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_psr.c @@ -221,13 +221,15 @@ EXPORT_SYMBOL(rockchip_drm_psr_flush_all); int rockchip_drm_psr_register(struct drm_encoder *encoder, void (*psr_set)(struct drm_encoder *, bool enable)) { - struct rockchip_drm_private *drm_drv = encoder->dev->dev_private; + struct rockchip_drm_private *drm_drv; struct psr_drv *psr; unsigned long flags; if (!encoder || !psr_set) return -EINVAL; + drm_drv = encoder->dev->dev_private; + psr = kzalloc(sizeof(struct psr_drv), GFP_KERNEL); if (!psr) return -ENOMEM; -- 2.20.1