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,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 41B58C10F11 for ; Mon, 22 Apr 2019 19:44:12 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 10D5A218D9 for ; Mon, 22 Apr 2019 19:44:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="rS+XLHsa"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="hLOnVKpX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 10D5A218D9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=3b/+tB1xpCFksHSU5p9fu73IifnxdDzSfL4eQYx+02A=; b=rS+XLHsapP48Rf OETZAAQjgl+HEXTBvUE3QhLMKpZ8/MczrCQdRo7t+DRNyvIbTYzUL+84XiXxBJssZYkHrFuuorvls MpHhSXfe/PZNaWlxY8T296Rfx2H71VDUZdPnyaQwyo9Fr0eqHE5kJS80lTnQUXPyzDePC47UkWC+7 7u+97IGEarZEJksxF/q9hJaecz/wd0yMFQ0sQEI8NID8iIFM7lFTpjomnQyS6X/YLm5d2sv6qmpXV Agovw309adKKOQn+mqyKTeoNucdM5w+QS+SeaZo83gyE3Er+CLpuAho+BjXBeaFlATcuupotrNC/y t6r5eQFMuY9eY+kkctHA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hIerC-0000oV-LM; Mon, 22 Apr 2019 19:44:02 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hIer6-0000g4-VN for linux-amlogic@lists.infradead.org; Mon, 22 Apr 2019 19:44:00 +0000 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 BB8C521901; Mon, 22 Apr 2019 19:43:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555962236; bh=FuDcAin+IjuMiPtgjpgAA5UrwqlL8qLDmzQSajn3e9o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hLOnVKpXsVm/qqo2NmIC8Mmr8x4Lz+PCpa7+WlBruiYcVFaQxQi0syM2L6q0Jt2ms xRAbhuxSArNN9cISmKGN/JPxg5tpAVutFwnaWjiyCPexkbs9T9W/8W0nDKhk9CdBiN nsOKtB4AOLaLwN4A2gitWLPGfAiI86j+zEE/PiA0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.0 56/98] drm/meson: Fix invalid pointer in meson_drv_unbind() Date: Mon, 22 Apr 2019 15:41:23 -0400 Message-Id: <20190422194205.10404-56-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190422194205.10404-1-sashal@kernel.org> References: <20190422194205.10404-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190422_124357_287020_98C0C2B2 X-CRM114-Status: GOOD ( 11.75 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jean-Philippe Brucker , Sasha Levin , linux-amlogic@lists.infradead.org, dri-devel@lists.freedesktop.org, Neil Armstrong Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org From: Jean-Philippe Brucker [ Upstream commit 776e78677f514ecddd12dba48b9040958999bd5a ] meson_drv_bind() registers a meson_drm struct as the device's privdata, but meson_drv_unbind() tries to retrieve a drm_device. This may cause a segfault on shutdown: [ 5194.593429] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000197 ... [ 5194.788850] Call trace: [ 5194.791349] drm_dev_unregister+0x1c/0x118 [drm] [ 5194.795848] meson_drv_unbind+0x50/0x78 [meson_drm] Retrieve the right pointer in meson_drv_unbind(). Fixes: bbbe775ec5b5 ("drm: Add support for Amlogic Meson Graphic Controller") Signed-off-by: Jean-Philippe Brucker Acked-by: Neil Armstrong Signed-off-by: Neil Armstrong Link: https://patchwork.freedesktop.org/patch/msgid/20190322152657.13752-1-jean-philippe.brucker@arm.com Signed-off-by: Sasha Levin (Microsoft) --- drivers/gpu/drm/meson/meson_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c index 12ff47b13668..c1115a96453f 100644 --- a/drivers/gpu/drm/meson/meson_drv.c +++ b/drivers/gpu/drm/meson/meson_drv.c @@ -336,8 +336,8 @@ static int meson_drv_bind(struct device *dev) static void meson_drv_unbind(struct device *dev) { - struct drm_device *drm = dev_get_drvdata(dev); - struct meson_drm *priv = drm->dev_private; + struct meson_drm *priv = dev_get_drvdata(dev); + struct drm_device *drm = priv->drm; if (priv->canvas) { meson_canvas_free(priv->canvas, priv->canvas_id_osd1); -- 2.19.1 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 5.0 56/98] drm/meson: Fix invalid pointer in meson_drv_unbind() Date: Mon, 22 Apr 2019 15:41:23 -0400 Message-ID: <20190422194205.10404-56-sashal@kernel.org> References: <20190422194205.10404-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id B41AB891AC for ; Mon, 22 Apr 2019 19:43:56 +0000 (UTC) In-Reply-To: <20190422194205.10404-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: Jean-Philippe Brucker , Sasha Levin , linux-amlogic@lists.infradead.org, dri-devel@lists.freedesktop.org, Neil Armstrong List-Id: dri-devel@lists.freedesktop.org RnJvbTogSmVhbi1QaGlsaXBwZSBCcnVja2VyIDxqZWFuLXBoaWxpcHBlLmJydWNrZXJAYXJtLmNv bT4KClsgVXBzdHJlYW0gY29tbWl0IDc3NmU3ODY3N2Y1MTRlY2RkZDEyZGJhNDhiOTA0MDk1ODk5 OWJkNWEgXQoKbWVzb25fZHJ2X2JpbmQoKSByZWdpc3RlcnMgYSBtZXNvbl9kcm0gc3RydWN0IGFz IHRoZSBkZXZpY2UncyBwcml2ZGF0YSwKYnV0IG1lc29uX2Rydl91bmJpbmQoKSB0cmllcyB0byBy ZXRyaWV2ZSBhIGRybV9kZXZpY2UuIFRoaXMgbWF5IGNhdXNlIGEKc2VnZmF1bHQgb24gc2h1dGRv d246CgpbIDUxOTQuNTkzNDI5XSBVbmFibGUgdG8gaGFuZGxlIGtlcm5lbCBOVUxMIHBvaW50ZXIg ZGVyZWZlcmVuY2UgYXQgdmlydHVhbCBhZGRyZXNzIDAwMDAwMDAwMDAwMDAxOTcKIC4uLgpbIDUx OTQuNzg4ODUwXSBDYWxsIHRyYWNlOgpbIDUxOTQuNzkxMzQ5XSAgZHJtX2Rldl91bnJlZ2lzdGVy KzB4MWMvMHgxMTggW2RybV0KWyA1MTk0Ljc5NTg0OF0gIG1lc29uX2Rydl91bmJpbmQrMHg1MC8w eDc4IFttZXNvbl9kcm1dCgpSZXRyaWV2ZSB0aGUgcmlnaHQgcG9pbnRlciBpbiBtZXNvbl9kcnZf dW5iaW5kKCkuCgpGaXhlczogYmJiZTc3NWVjNWI1ICgiZHJtOiBBZGQgc3VwcG9ydCBmb3IgQW1s b2dpYyBNZXNvbiBHcmFwaGljIENvbnRyb2xsZXIiKQpTaWduZWQtb2ZmLWJ5OiBKZWFuLVBoaWxp cHBlIEJydWNrZXIgPGplYW4tcGhpbGlwcGUuYnJ1Y2tlckBhcm0uY29tPgpBY2tlZC1ieTogTmVp bCBBcm1zdHJvbmcgPG5hcm1zdHJvbmdAYmF5bGlicmUuY29tPgpTaWduZWQtb2ZmLWJ5OiBOZWls IEFybXN0cm9uZyA8bmFybXN0cm9uZ0BiYXlsaWJyZS5jb20+Ckxpbms6IGh0dHBzOi8vcGF0Y2h3 b3JrLmZyZWVkZXNrdG9wLm9yZy9wYXRjaC9tc2dpZC8yMDE5MDMyMjE1MjY1Ny4xMzc1Mi0xLWpl YW4tcGhpbGlwcGUuYnJ1Y2tlckBhcm0uY29tClNpZ25lZC1vZmYtYnk6IFNhc2hhIExldmluIChN aWNyb3NvZnQpIDxzYXNoYWxAa2VybmVsLm9yZz4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vbWVzb24v bWVzb25fZHJ2LmMgfCA0ICsrLS0KIDEgZmlsZSBjaGFuZ2VkLCAyIGluc2VydGlvbnMoKyksIDIg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX2Ry di5jIGIvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX2Rydi5jCmluZGV4IDEyZmY0N2IxMzY2 OC4uYzExMTVhOTY0NTNmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbWVzb24vbWVzb25f ZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX2Rydi5jCkBAIC0zMzYsOCAr MzM2LDggQEAgc3RhdGljIGludCBtZXNvbl9kcnZfYmluZChzdHJ1Y3QgZGV2aWNlICpkZXYpCiAK IHN0YXRpYyB2b2lkIG1lc29uX2Rydl91bmJpbmQoc3RydWN0IGRldmljZSAqZGV2KQogewotCXN0 cnVjdCBkcm1fZGV2aWNlICpkcm0gPSBkZXZfZ2V0X2RydmRhdGEoZGV2KTsKLQlzdHJ1Y3QgbWVz b25fZHJtICpwcml2ID0gZHJtLT5kZXZfcHJpdmF0ZTsKKwlzdHJ1Y3QgbWVzb25fZHJtICpwcml2 ID0gZGV2X2dldF9kcnZkYXRhKGRldik7CisJc3RydWN0IGRybV9kZXZpY2UgKmRybSA9IHByaXYt PmRybTsKIAogCWlmIChwcml2LT5jYW52YXMpIHsKIAkJbWVzb25fY2FudmFzX2ZyZWUocHJpdi0+ Y2FudmFzLCBwcml2LT5jYW52YXNfaWRfb3NkMSk7Ci0tIAoyLjE5LjEKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QK ZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbA== 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=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,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 82EF0C10F11 for ; Mon, 22 Apr 2019 20:08:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 458BC204EC for ; Mon, 22 Apr 2019 20:08:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555963689; bh=FuDcAin+IjuMiPtgjpgAA5UrwqlL8qLDmzQSajn3e9o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=qm1WN3f3LmZUkGzBur3yqunY1LPA64hCorPXd3CvZ+UAow2lIbcDB6x1MzcooFjL8 pasqeOf169xqEUmNRgDhKttXyA20I1XEDFL798cOjFDQx4Y+1HKUdKKTFAy8Q7sBzg QpoJNAx/xBTSEk75X4UC2iupUiZemBjOcgHYML+o= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728801AbfDVTn7 (ORCPT ); Mon, 22 Apr 2019 15:43:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:44742 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729309AbfDVTn5 (ORCPT ); Mon, 22 Apr 2019 15:43:57 -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 BB8C521901; Mon, 22 Apr 2019 19:43:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555962236; bh=FuDcAin+IjuMiPtgjpgAA5UrwqlL8qLDmzQSajn3e9o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hLOnVKpXsVm/qqo2NmIC8Mmr8x4Lz+PCpa7+WlBruiYcVFaQxQi0syM2L6q0Jt2ms xRAbhuxSArNN9cISmKGN/JPxg5tpAVutFwnaWjiyCPexkbs9T9W/8W0nDKhk9CdBiN nsOKtB4AOLaLwN4A2gitWLPGfAiI86j+zEE/PiA0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jean-Philippe Brucker , Neil Armstrong , Sasha Levin , dri-devel@lists.freedesktop.org, linux-amlogic@lists.infradead.org Subject: [PATCH AUTOSEL 5.0 56/98] drm/meson: Fix invalid pointer in meson_drv_unbind() Date: Mon, 22 Apr 2019 15:41:23 -0400 Message-Id: <20190422194205.10404-56-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190422194205.10404-1-sashal@kernel.org> References: <20190422194205.10404-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: Jean-Philippe Brucker [ Upstream commit 776e78677f514ecddd12dba48b9040958999bd5a ] meson_drv_bind() registers a meson_drm struct as the device's privdata, but meson_drv_unbind() tries to retrieve a drm_device. This may cause a segfault on shutdown: [ 5194.593429] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000197 ... [ 5194.788850] Call trace: [ 5194.791349] drm_dev_unregister+0x1c/0x118 [drm] [ 5194.795848] meson_drv_unbind+0x50/0x78 [meson_drm] Retrieve the right pointer in meson_drv_unbind(). Fixes: bbbe775ec5b5 ("drm: Add support for Amlogic Meson Graphic Controller") Signed-off-by: Jean-Philippe Brucker Acked-by: Neil Armstrong Signed-off-by: Neil Armstrong Link: https://patchwork.freedesktop.org/patch/msgid/20190322152657.13752-1-jean-philippe.brucker@arm.com Signed-off-by: Sasha Levin (Microsoft) --- drivers/gpu/drm/meson/meson_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c index 12ff47b13668..c1115a96453f 100644 --- a/drivers/gpu/drm/meson/meson_drv.c +++ b/drivers/gpu/drm/meson/meson_drv.c @@ -336,8 +336,8 @@ static int meson_drv_bind(struct device *dev) static void meson_drv_unbind(struct device *dev) { - struct drm_device *drm = dev_get_drvdata(dev); - struct meson_drm *priv = drm->dev_private; + struct meson_drm *priv = dev_get_drvdata(dev); + struct drm_device *drm = priv->drm; if (priv->canvas) { meson_canvas_free(priv->canvas, priv->canvas_id_osd1); -- 2.19.1