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=-11.5 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 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 98769C43387 for ; Fri, 11 Jan 2019 12:59:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 67A8A20836 for ; Fri, 11 Jan 2019 12:59:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547211551; bh=iDiaK2Aa6s8NAQCUXgPoeVIB8HhVF6sna96gtLVnjYw=; h=Subject:To:Cc:From:Date:List-ID:From; b=su7oiTrUebMJk4onSqIPMqkwkNmqeoz8XedEdcvh0Lc3LuhLrjmxdHo2vpZlECGsJ CKI5XoF7WxUkWYRdqze5VbDn0p7d9M44ahxaTWXQZq05dfkF1MexCZafwK/WpwmxGO a2xIjCt79YrDnqoN6Ps0Dy2TYj8TplBEYPUJoZPs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731587AbfAKM7L (ORCPT ); Fri, 11 Jan 2019 07:59:11 -0500 Received: from new3-smtp.messagingengine.com ([66.111.4.229]:44493 "EHLO new3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731545AbfAKM7K (ORCPT ); Fri, 11 Jan 2019 07:59:10 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailnew.nyi.internal (Postfix) with ESMTP id A92F810F9B; Fri, 11 Jan 2019 07:59:09 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Fri, 11 Jan 2019 07:59:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=ao7MsS rxKDb1m9vNVXORjYn67cxVwDvZjhwlsl1avPU=; b=I+B23SzE3PivAHEU3DQ/1s Tl/xHm0db1J4cFwlxupg++oNbBYeI3cdOFYnN2aZXtCr6DZmVNQtoCS7uQSVB3w9 yHJVOi7x75Nq2Vh+ZgfW5H0Zpam2qMOQsOFJCzQq8sB0vyHhsja6uh9ONipboeI3 tI3Kv4wBr2615mDp5EkZkk81SoE3qu8UjKKdAP32ddIMNLPi6AQ0Ash/0uIbjeYI g4SgvU2NYi3din9OMujtd1a39BOg+xprnnkrnPiccGBEovwNJJOCa5Sk6N61zvQ/ ctWVVus/+Mr6iA91e2ng+XY8ewTb3tot7sygIE32ckrQ05InEeBJHaCvwsU0c1BQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtledrfeehgdegjecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfhuthenuceurghilhhouhhtmecufedt tdenucgoufhprghmkfhpucdlfedttddmnecujfgurhepuffvhfffkfggtgfgsehtkeertd dttdflnecuhfhrohhmpeeoghhrvghgkhhhsehlihhnuhigfhhouhhnuggrthhiohhnrdho rhhgqeenucffohhmrghinhepfhhrvggvuggvshhkthhophdrohhrghenucfkphepkeefrd ekiedrkeelrddutdejnecurfgrrhgrmhepmhgrihhlfhhrohhmpehgrhgvgheskhhrohgr hhdrtghomhenucevlhhushhtvghrufhiiigvpedu X-ME-Proxy: Received: from localhost (5356596b.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id 1C91AE4394; Fri, 11 Jan 2019 07:59:09 -0500 (EST) Subject: FAILED: patch "[PATCH] drm/rockchip: psr: do not dereference encoder before it is" failed to apply to 4.19-stable tree To: enric.balletbo@collabora.com, heiko@sntech.de Cc: From: Date: Fri, 11 Jan 2019 13:59:07 +0100 Message-ID: <15472115475372@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 4eda776c3cefcb1f01b2d85bd8753f67606282b5 Mon Sep 17 00:00:00 2001 From: Enric Balletbo i Serra Date: Sat, 13 Oct 2018 12:56:54 +0200 Subject: [PATCH] drm/rockchip: psr: do not dereference encoder before it is null checked. '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 diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_psr.c b/drivers/gpu/drm/rockchip/rockchip_drm_psr.c index 79d00d861a31..01ff3c858875 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_psr.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_psr.c @@ -189,12 +189,14 @@ EXPORT_SYMBOL(rockchip_drm_psr_flush_all); int rockchip_drm_psr_register(struct drm_encoder *encoder, int (*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; if (!encoder || !psr_set) return -EINVAL; + drm_drv = encoder->dev->dev_private; + psr = kzalloc(sizeof(struct psr_drv), GFP_KERNEL); if (!psr) return -ENOMEM;