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, 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 7B359C43381 for ; Wed, 27 Mar 2019 19:13:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 427FD206BA for ; Wed, 27 Mar 2019 19:13:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553714031; bh=01VqPdlFPIK6RNZX2Ff987mTB+xR27JBA6daZlddGLY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=VgTbQiSWpss+jimA+0GcvLN4PIb+WfGCh1eLm9N9H+0Rsv4GR7i4cIeoiIZef5DQ/ mm+4jeSjlJLwmtJEM7pmrsHc9n8t8QdbFm6Hyk204es3DduTtWPvFGrOMNgHZYMJ7q EL46f63MLOpdVntMSL+L0KavWOS0Dwz4+awtjEic= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388871AbfC0TNt (ORCPT ); Wed, 27 Mar 2019 15:13:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:52036 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731047AbfC0SKE (ORCPT ); Wed, 27 Mar 2019 14:10:04 -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 7F32B2184C; Wed, 27 Mar 2019 18:10:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553710203; bh=01VqPdlFPIK6RNZX2Ff987mTB+xR27JBA6daZlddGLY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OZWpmB1D0u9jThXdFuZtEKrWZb5ZAnlEjD7gkaM7yOz47VpNq4taxePQQjGKm++O1 aFcEq9eYA25k0SkUeJhLn0CWqdiqQX3BRHBZRmu15oDPqz1lMjlI2+0LfssXNSZ/J2 VB05hi9cPY52Q4iSjlls4BPVzoMVW2jsbC1CjH1o= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Peter Wu , =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= , Sasha Levin , dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.0 248/262] drm/fb-helper: fix leaks in error path of drm_fb_helper_fbdev_setup Date: Wed, 27 Mar 2019 14:01:43 -0400 Message-Id: <20190327180158.10245-248-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190327180158.10245-1-sashal@kernel.org> References: <20190327180158.10245-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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: Peter Wu [ Upstream commit 00eb5b0da8d27b3c944bfc959c3344d665caae26 ] After drm_fb_helper_fbdev_setup calls drm_fb_helper_init, "dev->fb_helper" will be initialized (and thus drm_fb_helper_fini will have some effect). After that, drm_fb_helper_initial_config is called which may call the "fb_probe" driver callback. This driver callback may call drm_fb_helper_defio_init (as is done by drm_fb_helper_generic_probe) or set a framebuffer (as is done by bochs) as documented. These are normally cleaned up on exit by drm_fb_helper_fbdev_teardown which also calls drm_fb_helper_fini. If an error occurs after "fb_probe", but before setup is complete, then calling just drm_fb_helper_fini will leak resources. This was triggered by df2052cc922 ("bochs: convert to drm_fb_helper_fbdev_setup/teardown"): [ 50.008030] bochsdrmfb: enable CONFIG_FB_LITTLE_ENDIAN to support this framebuffer [ 50.009436] bochs-drm 0000:00:02.0: [drm:drm_fb_helper_fbdev_setup] *ERROR* fbdev: Failed to set configuration (ret=-38) [ 50.011456] [drm] Initialized bochs-drm 1.0.0 20130925 for 0000:00:02.0 on minor 2 [ 50.013604] WARNING: CPU: 1 PID: 1 at drivers/gpu/drm/drm_mode_config.c:477 drm_mode_config_cleanup+0x280/0x2a0 [ 50.016175] CPU: 1 PID: 1 Comm: swapper/0 Tainted: G T 4.20.0-rc7 #1 [ 50.017732] EIP: drm_mode_config_cleanup+0x280/0x2a0 ... [ 50.023155] Call Trace: [ 50.023155] ? bochs_kms_fini+0x1e/0x30 [ 50.023155] ? bochs_unload+0x18/0x40 This can be reproduced with QEMU and CONFIG_FB_LITTLE_ENDIAN=n. Link: https://lkml.kernel.org/r/20181221083226.GI23332@shao2-debian Link: https://lkml.kernel.org/r/20181223004315.GA11455@al Fixes: 8741216396b2 ("drm/fb-helper: Add drm_fb_helper_fbdev_setup/teardown()") Reported-by: kernel test robot Cc: Noralf Trønnes Signed-off-by: Peter Wu Reviewed-by: Noralf Trønnes Signed-off-by: Noralf Trønnes Link: https://patchwork.freedesktop.org/patch/msgid/20181223005507.28328-1-peter@lekensteyn.nl Signed-off-by: Sasha Levin --- drivers/gpu/drm/drm_fb_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 70fc8e356b18..edd8cb497f3b 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -2891,7 +2891,7 @@ int drm_fb_helper_fbdev_setup(struct drm_device *dev, return 0; err_drm_fb_helper_fini: - drm_fb_helper_fini(fb_helper); + drm_fb_helper_fbdev_teardown(dev); return ret; } -- 2.19.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 5.0 248/262] drm/fb-helper: fix leaks in error path of drm_fb_helper_fbdev_setup Date: Wed, 27 Mar 2019 14:01:43 -0400 Message-ID: <20190327180158.10245-248-sashal@kernel.org> References: <20190327180158.10245-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 5B4FF6E283 for ; Wed, 27 Mar 2019 18:10:03 +0000 (UTC) In-Reply-To: <20190327180158.10245-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: Sasha Levin , Peter Wu , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogUGV0ZXIgV3UgPHBldGVyQGxla2Vuc3RleW4ubmw+CgpbIFVwc3RyZWFtIGNvbW1pdCAw MGViNWIwZGE4ZDI3YjNjOTQ0YmZjOTU5YzMzNDRkNjY1Y2FhZTI2IF0KCkFmdGVyIGRybV9mYl9o ZWxwZXJfZmJkZXZfc2V0dXAgY2FsbHMgZHJtX2ZiX2hlbHBlcl9pbml0LAoiZGV2LT5mYl9oZWxw ZXIiIHdpbGwgYmUgaW5pdGlhbGl6ZWQgKGFuZCB0aHVzIGRybV9mYl9oZWxwZXJfZmluaSB3aWxs CmhhdmUgc29tZSBlZmZlY3QpLiBBZnRlciB0aGF0LCBkcm1fZmJfaGVscGVyX2luaXRpYWxfY29u ZmlnIGlzIGNhbGxlZAp3aGljaCBtYXkgY2FsbCB0aGUgImZiX3Byb2JlIiBkcml2ZXIgY2FsbGJh Y2suCgpUaGlzIGRyaXZlciBjYWxsYmFjayBtYXkgY2FsbCBkcm1fZmJfaGVscGVyX2RlZmlvX2lu aXQgKGFzIGlzIGRvbmUgYnkKZHJtX2ZiX2hlbHBlcl9nZW5lcmljX3Byb2JlKSBvciBzZXQgYSBm cmFtZWJ1ZmZlciAoYXMgaXMgZG9uZSBieSBib2NocykKYXMgZG9jdW1lbnRlZC4gVGhlc2UgYXJl IG5vcm1hbGx5IGNsZWFuZWQgdXAgb24gZXhpdCBieQpkcm1fZmJfaGVscGVyX2ZiZGV2X3RlYXJk b3duIHdoaWNoIGFsc28gY2FsbHMgZHJtX2ZiX2hlbHBlcl9maW5pLgoKSWYgYW4gZXJyb3Igb2Nj dXJzIGFmdGVyICJmYl9wcm9iZSIsIGJ1dCBiZWZvcmUgc2V0dXAgaXMgY29tcGxldGUsIHRoZW4K Y2FsbGluZyBqdXN0IGRybV9mYl9oZWxwZXJfZmluaSB3aWxsIGxlYWsgcmVzb3VyY2VzLiBUaGlz IHdhcyB0cmlnZ2VyZWQKYnkgZGYyMDUyY2M5MjIgKCJib2NoczogY29udmVydCB0byBkcm1fZmJf aGVscGVyX2ZiZGV2X3NldHVwL3RlYXJkb3duIik6CgogICAgWyAgIDUwLjAwODAzMF0gYm9jaHNk cm1mYjogZW5hYmxlIENPTkZJR19GQl9MSVRUTEVfRU5ESUFOIHRvIHN1cHBvcnQgdGhpcyBmcmFt ZWJ1ZmZlcgogICAgWyAgIDUwLjAwOTQzNl0gYm9jaHMtZHJtIDAwMDA6MDA6MDIuMDogW2RybTpk cm1fZmJfaGVscGVyX2ZiZGV2X3NldHVwXSAqRVJST1IqIGZiZGV2OiBGYWlsZWQgdG8gc2V0IGNv bmZpZ3VyYXRpb24gKHJldD0tMzgpCiAgICBbICAgNTAuMDExNDU2XSBbZHJtXSBJbml0aWFsaXpl ZCBib2Nocy1kcm0gMS4wLjAgMjAxMzA5MjUgZm9yIDAwMDA6MDA6MDIuMCBvbiBtaW5vciAyCiAg ICBbICAgNTAuMDEzNjA0XSBXQVJOSU5HOiBDUFU6IDEgUElEOiAxIGF0IGRyaXZlcnMvZ3B1L2Ry bS9kcm1fbW9kZV9jb25maWcuYzo0NzcgZHJtX21vZGVfY29uZmlnX2NsZWFudXArMHgyODAvMHgy YTAKICAgIFsgICA1MC4wMTYxNzVdIENQVTogMSBQSUQ6IDEgQ29tbTogc3dhcHBlci8wIFRhaW50 ZWQ6IEcgICAgICAgICAgICAgICAgVCA0LjIwLjAtcmM3ICMxCiAgICBbICAgNTAuMDE3NzMyXSBF SVA6IGRybV9tb2RlX2NvbmZpZ19jbGVhbnVwKzB4MjgwLzB4MmEwCiAgICAuLi4KICAgIFsgICA1 MC4wMjMxNTVdIENhbGwgVHJhY2U6CiAgICBbICAgNTAuMDIzMTU1XSAgPyBib2Noc19rbXNfZmlu aSsweDFlLzB4MzAKICAgIFsgICA1MC4wMjMxNTVdICA/IGJvY2hzX3VubG9hZCsweDE4LzB4NDAK ClRoaXMgY2FuIGJlIHJlcHJvZHVjZWQgd2l0aCBRRU1VIGFuZCBDT05GSUdfRkJfTElUVExFX0VO RElBTj1uLgoKTGluazogaHR0cHM6Ly9sa21sLmtlcm5lbC5vcmcvci8yMDE4MTIyMTA4MzIyNi5H STIzMzMyQHNoYW8yLWRlYmlhbgpMaW5rOiBodHRwczovL2xrbWwua2VybmVsLm9yZy9yLzIwMTgx MjIzMDA0MzE1LkdBMTE0NTVAYWwKRml4ZXM6IDg3NDEyMTYzOTZiMiAoImRybS9mYi1oZWxwZXI6 IEFkZCBkcm1fZmJfaGVscGVyX2ZiZGV2X3NldHVwL3RlYXJkb3duKCkiKQpSZXBvcnRlZC1ieTog a2VybmVsIHRlc3Qgcm9ib3QgPHJvbmcuYS5jaGVuQGludGVsLmNvbT4KQ2M6IE5vcmFsZiBUcsO4 bm5lcyA8bm9yYWxmQHRyb25uZXMub3JnPgpTaWduZWQtb2ZmLWJ5OiBQZXRlciBXdSA8cGV0ZXJA bGVrZW5zdGV5bi5ubD4KUmV2aWV3ZWQtYnk6IE5vcmFsZiBUcsO4bm5lcyA8bm9yYWxmQHRyb25u ZXMub3JnPgpTaWduZWQtb2ZmLWJ5OiBOb3JhbGYgVHLDuG5uZXMgPG5vcmFsZkB0cm9ubmVzLm9y Zz4KTGluazogaHR0cHM6Ly9wYXRjaHdvcmsuZnJlZWRlc2t0b3Aub3JnL3BhdGNoL21zZ2lkLzIw MTgxMjIzMDA1NTA3LjI4MzI4LTEtcGV0ZXJAbGVrZW5zdGV5bi5ubApTaWduZWQtb2ZmLWJ5OiBT YXNoYSBMZXZpbiA8c2FzaGFsQGtlcm5lbC5vcmc+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9m Yl9oZWxwZXIuYyB8IDIgKy0KIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMSBkZWxl dGlvbigtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fZmJfaGVscGVyLmMgYi9k cml2ZXJzL2dwdS9kcm0vZHJtX2ZiX2hlbHBlci5jCmluZGV4IDcwZmM4ZTM1NmIxOC4uZWRkOGNi NDk3ZjNiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2ZiX2hlbHBlci5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9kcm1fZmJfaGVscGVyLmMKQEAgLTI4OTEsNyArMjg5MSw3IEBAIGlu dCBkcm1fZmJfaGVscGVyX2ZiZGV2X3NldHVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJcmV0 dXJuIDA7CiAKIGVycl9kcm1fZmJfaGVscGVyX2Zpbmk6Ci0JZHJtX2ZiX2hlbHBlcl9maW5pKGZi X2hlbHBlcik7CisJZHJtX2ZiX2hlbHBlcl9mYmRldl90ZWFyZG93bihkZXYpOwogCiAJcmV0dXJu IHJldDsKIH0KLS0gCjIuMTkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v ZHJpLWRldmVs