From patchwork Tue Jun 23 19:57:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 223425 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.0 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, 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 4F71AC433E0 for ; Tue, 23 Jun 2020 20:38:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1F9CB217A0 for ; Tue, 23 Jun 2020 20:38:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592944709; bh=KwE2zr8QuRvUrKHK11DnbJJhXEO46UNR1PxVwmzzL+E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bF88mjRzrlP2aEVV/zK3Ixz7I3EwMOMwY9rcasJMfY7Tyr/kiEC1tqdwoq+DTl/vI in7d5DUXGO9S8HFooWmiQp/YIKNqSOraUKxEV9c19wv7bGk423DENxGLJvE831f1wl 23ScYuMtPmnqPbqd15TykI1qG2mtH3W+qzp91n9Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391957AbgFWUi1 (ORCPT ); Tue, 23 Jun 2020 16:38:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:33936 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389722AbgFWUi0 (ORCPT ); Tue, 23 Jun 2020 16:38:26 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7F3FE2085B; Tue, 23 Jun 2020 20:38:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592944707; bh=KwE2zr8QuRvUrKHK11DnbJJhXEO46UNR1PxVwmzzL+E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BtvHjLjG5zwfRwECFghMoPinXV15hCJ+8C8suKxRynl+83+GcU6MfpVTc8P0ZCR04 JWwzVQUwROcBk3ORUCxN1wVtgraEpa7SVBiE9v8X0TGLTGNvpWRfZVmdIHGlFQAT8K is2rSsLr5MFu5nm+ue8oUJ/GpjbTP0F6ELDgZ7y4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Roy Spliet , Abhinav Kumar , Rob Clark , Sasha Levin Subject: [PATCH 4.19 092/206] drm/msm/mdp5: Fix mdp5_init error path for failed mdp5_kms allocation Date: Tue, 23 Jun 2020 21:57:00 +0200 Message-Id: <20200623195321.465000369@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195316.864547658@linuxfoundation.org> References: <20200623195316.864547658@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 bddd625ab91bd..25691b7cece15 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c @@ -1021,7 +1021,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; }