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 A045DC433E0 for ; Thu, 18 Jun 2020 02:39:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6F980206E2 for ; Thu, 18 Jun 2020 02:39:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592447959; bh=tgmLfevUX9lI0PeC7Z40erGfpQqe3mE/JRPlDRFsIrY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YAEzTQY9fLCvxg8WWI1cUGsm04vsHG2ao4ttwYTQaeLebgcyj8qqjtMmYogCo2+4Q QfPMKMdDzzzZVWWyNaDC+igiXGSjhgIt9AOnlupjVzo3TWTMLrbQJMXeej6+IRRhNq 2IQoxzYbuavt4zkckw0DROapawG1WQ/h4qGcXYSg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387803AbgFRCjS (ORCPT ); Wed, 17 Jun 2020 22:39:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:42102 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729047AbgFRBNI (ORCPT ); Wed, 17 Jun 2020 21:13:08 -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 C1DD2214DB; Thu, 18 Jun 2020 01:13:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442787; bh=tgmLfevUX9lI0PeC7Z40erGfpQqe3mE/JRPlDRFsIrY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1WQ90H61O20dVOwtNT9TICp1+7r5j8WLvzyKy3fdpRlCO1MqKU5ycFcHlpCAWq0Zv AhONtsJBGg3WWwvCwoD4QKEwCm+K4Ft8ixNJ/kf8OT9WEYFWpXOLP+XCmzUctik9dj UgRZqoxm9oaRcJlhsIPx2no5MiIU0mYocRXXIPsw= 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 5.7 231/388] drm/msm/mdp5: Fix mdp5_init error path for failed mdp5_kms allocation Date: Wed, 17 Jun 2020 21:05:28 -0400 Message-Id: <20200618010805.600873-231-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-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: 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/disp/mdp5/mdp5_kms.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c index 47b989834af1..c23a2fa13fb9 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c @@ -943,7 +943,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