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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,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 79D84C433E0 for ; Thu, 18 Jun 2020 01:50:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5841321532 for ; Thu, 18 Jun 2020 01:50:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592445033; bh=1suXfqXB8wFHhKBMZXOWemYVz8CFAzks7HX0TcBdIrA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=e0tOYpSWFylhmPnM/HnaWvd12dy3irWDPhAG9b97a9RYaEvZmWwqZckW92rlUgpZE JIFlfBS51+ilWHilwgK+svRw0yfEQrLpJ+kGC9WGw9Xw/7P0bqwzX5q839M7zn/D4U YPfwkuUZSxdO8G/sOp9gIkpNFBWMi4omyyry9tKA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732107AbgFRBuc (ORCPT ); Wed, 17 Jun 2020 21:50:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:35512 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731855AbgFRB1W (ORCPT ); Wed, 17 Jun 2020 21:27:22 -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 99A94221EB; Thu, 18 Jun 2020 01:27:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592443642; bh=1suXfqXB8wFHhKBMZXOWemYVz8CFAzks7HX0TcBdIrA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gH9AxSDfg4M4mkfnR9z+ZO8Zdu3qxL0Erxg/KWjgVBEFpUNmi7dNwfZbjW7oUThUK m5DE4elAw+upGUw/+ihwI7pzbV13+BsKIrL3+O4fZmFwv2EnQsVJ1iohM+MdpwP/xz dy0AavOjUt/wbYb2fhdY+jhbiFoL4RGvYCh73bqg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Roy Spliet , Abhinav Kumar , Rob Clark , Sasha Levin , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.14 064/108] drm/msm/mdp5: Fix mdp5_init error path for failed mdp5_kms allocation Date: Wed, 17 Jun 2020 21:25:16 -0400 Message-Id: <20200618012600.608744-64-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618012600.608744-1-sashal@kernel.org> References: <20200618012600.608744-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Roy Spliet [ Upstream commit e4337877c5d578722c0716f131fb774522013cf5 ] When allocation for mdp5_kms fails, calling mdp5_destroy() leads to undefined behaviour, likely a nullptr exception or use-after-free troubles. Signed-off-by: Roy Spliet Reviewed-by: Abhinav Kumar Signed-off-by: Rob Clark Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c index f7c0698fec40..791a74b9907d 100644 --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c @@ -972,7 +972,8 @@ static int mdp5_init(struct platform_device *pdev, struct drm_device *dev) return 0; fail: - mdp5_destroy(pdev); + if (mdp5_kms) + mdp5_destroy(pdev); return ret; } -- 2.25.1