From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.14 67/95] drm/rockchip: psr: do not dereference encoder before it is null checked. Date: Tue, 7 May 2019 01:37:56 -0400 Message-ID: <20190507053826.31622-67-sashal@kernel.org> References: <20190507053826.31622-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190507053826.31622-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Enric Balletbo i Serra , Sasha Levin , dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org List-Id: linux-rockchip.vger.kernel.org RnJvbTogRW5yaWMgQmFsbGV0Ym8gaSBTZXJyYSA8ZW5yaWMuYmFsbGV0Ym9AY29sbGFib3JhLmNv bT4KClsgVXBzdHJlYW0gY29tbWl0IDRlZGE3NzZjM2NlZmNiMWYwMWIyZDg1YmQ4NzUzZjY3NjA2 MjgyYjUgXQoKJ2VuY29kZXInIGlzIGRlcmVmZXJlbmNlZCBiZWZvcmUgaXQgaXMgbnVsbCBzYW5p dHkgY2hlY2tlZCwgaGVuY2Ugd2UKcG90ZW50aWFsbHkgaGF2ZSBhIG51bGwgcG9pbnRlciBkZXJl ZmVyZW5jZSBidWcuIEluc3RlYWQsIGluaXRpYWxpc2UKZHJtX2RydiBmcm9tIGVuY29kZXItPmRl di0+ZGV2X3ByaXZhdGUgYWZ0ZXIgd2UgYXJlIHN1cmUgJ2VuY29kZXInIGlzCm5vdCBudWxsLgoK Rml4ZXM6IDUxODJjMWE1NTZkN2YgKCJkcm0vcm9ja2NoaXA6IGFkZCBhbiBjb21tb24gYWJzdHJh Y3RlZCBQU1IgZHJpdmVyIikKQ2M6IHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmcKU2lnbmVkLW9mZi1i eTogRW5yaWMgQmFsbGV0Ym8gaSBTZXJyYSA8ZW5yaWMuYmFsbGV0Ym9AY29sbGFib3JhLmNvbT4K U2lnbmVkLW9mZi1ieTogSGVpa28gU3R1ZWJuZXIgPGhlaWtvQHNudGVjaC5kZT4KTGluazogaHR0 cHM6Ly9wYXRjaHdvcmsuZnJlZWRlc2t0b3Aub3JnL3BhdGNoL21zZ2lkLzIwMTgxMDEzMTA1NjU0 LjExODI3LTEtZW5yaWMuYmFsbGV0Ym9AY29sbGFib3JhLmNvbQpTaWduZWQtb2ZmLWJ5OiBTYXNo YSBMZXZpbiA8YWxleGFuZGVyLmxldmluQG1pY3Jvc29mdC5jb20+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2RybV9wc3IuYyB8IDQgKysrLQogMSBmaWxlIGNoYW5nZWQs IDMgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fcHNyLmMgYi9kcml2ZXJzL2dwdS9kcm0vcm9ja2No aXAvcm9ja2NoaXBfZHJtX3Bzci5jCmluZGV4IGE1NTNlMTgyZmY1My4uMzJlN2RiYTJiZjVlIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX3Bzci5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fcHNyLmMKQEAgLTIyMSwx MyArMjIxLDE1IEBAIEVYUE9SVF9TWU1CT0wocm9ja2NoaXBfZHJtX3Bzcl9mbHVzaF9hbGwpOwog aW50IHJvY2tjaGlwX2RybV9wc3JfcmVnaXN0ZXIoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVy LAogCQkJdm9pZCAoKnBzcl9zZXQpKHN0cnVjdCBkcm1fZW5jb2RlciAqLCBib29sIGVuYWJsZSkp CiB7Ci0Jc3RydWN0IHJvY2tjaGlwX2RybV9wcml2YXRlICpkcm1fZHJ2ID0gZW5jb2Rlci0+ZGV2 LT5kZXZfcHJpdmF0ZTsKKwlzdHJ1Y3Qgcm9ja2NoaXBfZHJtX3ByaXZhdGUgKmRybV9kcnY7CiAJ c3RydWN0IHBzcl9kcnYgKnBzcjsKIAl1bnNpZ25lZCBsb25nIGZsYWdzOwogCiAJaWYgKCFlbmNv ZGVyIHx8ICFwc3Jfc2V0KQogCQlyZXR1cm4gLUVJTlZBTDsKIAorCWRybV9kcnYgPSBlbmNvZGVy LT5kZXYtPmRldl9wcml2YXRlOworCiAJcHNyID0ga3phbGxvYyhzaXplb2Yoc3RydWN0IHBzcl9k cnYpLCBHRlBfS0VSTkVMKTsKIAlpZiAoIXBzcikKIAkJcmV0dXJuIC1FTk9NRU07Ci0tIAoyLjIw LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1k ZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbA== 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.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 AD8FEC004C9 for ; Tue, 7 May 2019 05:48:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 75A31206A3 for ; Tue, 7 May 2019 05:48:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557208133; bh=C/SEdJvcztVmaWYIHppHb6GDJ7iOjWkEKhogPF8LK1I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zhi8p/61b9T0/gtGApBM5xSiDlZMhd3R166peMMkc0Er2Qzl0V5c/+Q66pk+x2urE DyacnxqCWaWvpVznNuZn76pB2tH407dVG6qxYHBjcEZ+PTwvTLVbWlPOv3n1DWOznc vWXsUbYy4mDnvj+WCt0WgjD1ZcJapIzetq1Huqvk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729150AbfEGFkl (ORCPT ); Tue, 7 May 2019 01:40:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:59996 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729119AbfEGFka (ORCPT ); Tue, 7 May 2019 01:40:30 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0F8DC2087F; Tue, 7 May 2019 05:40:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557207629; bh=C/SEdJvcztVmaWYIHppHb6GDJ7iOjWkEKhogPF8LK1I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GzLugjq8V/bTzbg43eUiU523ZrMeJwpsfGuXMzckElO7DXJomqN+NW2UIm8pAkKLX P8PJcWgoVtZwneNDn/RzqxYprPZOMjqwTh2QRLvazvthMHftSn+VDRaPacvKN9DB/S ZnuI51kryP7CnSTdJMEXm+769qAfAvPj1/1zVw+s= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Enric Balletbo i Serra , Heiko Stuebner , Sasha Levin , dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org Subject: [PATCH AUTOSEL 4.14 67/95] drm/rockchip: psr: do not dereference encoder before it is null checked. Date: Tue, 7 May 2019 01:37:56 -0400 Message-Id: <20190507053826.31622-67-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190507053826.31622-1-sashal@kernel.org> References: <20190507053826.31622-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Enric Balletbo i Serra [ 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 a553e182ff53..32e7dba2bf5e 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