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=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 AD46CC433E1 for ; Thu, 18 Jun 2020 01:23:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 76D0920CC7 for ; Thu, 18 Jun 2020 01:23:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592443394; bh=LTMmFEC2MVsr0SbZvuqP5QkFFX4Lbmxd/SYzppacUXE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=T/j0ccujNCF5NkvuCDHEEdIcpWHfCq0aOnpopH1oz/nyGFYIL5R5vsAL5xj1T4Q/i deH7CM4bMW2IJcmua9cUMBorJsSBZYHfADiXGWJo96f21sgnEzd5v/8qn8yUHLRKFm Gp2oSD8Bm75tW2ezfAtb1a6oBJbf2ALUkgvB2uTI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730935AbgFRBXM (ORCPT ); Wed, 17 Jun 2020 21:23:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:51710 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730227AbgFRBT5 (ORCPT ); Wed, 17 Jun 2020 21:19: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 E2F6D221F1; Thu, 18 Jun 2020 01:19:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592443196; bh=LTMmFEC2MVsr0SbZvuqP5QkFFX4Lbmxd/SYzppacUXE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oGOEplATB1AVZusHTu3ZHzzaWz1fSiziCeM9imDFefYEMgCSPiLqpu8XXAQqrouwn Tuzcmke1UZ1UKcT/HV0rP2lM24OjAA7Cah3vOKb/H2KzVn8LRle07s07ZiSjBfU9oJ DM0lap+s6hWY/kVhJLDOXZh6q2SjaN+F1Zo3fQFg= 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.4 156/266] drm/msm/mdp5: Fix mdp5_init error path for failed mdp5_kms allocation Date: Wed, 17 Jun 2020 21:14:41 -0400 Message-Id: <20200618011631.604574-156-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618011631.604574-1-sashal@kernel.org> References: <20200618011631.604574-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 91cd76a2bab1..77823ccdd0f8 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c @@ -1037,7 +1037,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