From patchwork Tue Sep 29 10:58:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 263127 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=-13.5 required=3.0 tests=BAYES_00,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=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 721F9C4741F for ; Tue, 29 Sep 2020 12:04:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 21D572074B for ; Tue, 29 Sep 2020 12:04:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601381081; bh=LoTtfgHtKtt1kt5u8RjyjW+2ok8FCys6Buytalzc7l8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0Dwt01nmn6eHftKYE+JecjuwU1HSvzm78KSUc0WGfSTbbp4vtefUBTTaYkWez6XFr o7OvluBnbtgf1nSPyh5za2mZlfL9dS6v/cb4tb9yvW2bd3c5tvTP/k3t8xXt4tvFjY p4ELgge8cPPpyCjYArp65GrxDUu7xkF6CR5n3ick= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730288AbgI2MEh (ORCPT ); Tue, 29 Sep 2020 08:04:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:53442 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729559AbgI2Lhq (ORCPT ); Tue, 29 Sep 2020 07:37:46 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 5D98F2074A; Tue, 29 Sep 2020 11:37:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601379465; bh=LoTtfgHtKtt1kt5u8RjyjW+2ok8FCys6Buytalzc7l8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=loqQaTqn/kwTHfoJ7TvtPbkITEfxsuJepA2AXzvAhRjRYHGKJceE/KicQUayblJ6D Lbv3bSrFYCK6rKg/1K3fmTn1t4x3WxEUWoMPqMW1WYv0xdDOXKKU9olqMwDF5VXKmA /EIIcm0uIu0uaYNNvfrl8HWnOBlGqXpr55wlVKHo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pavel Machek , Rob Clark , Sasha Levin Subject: [PATCH 5.4 175/388] drm/msm: fix leaks if initialization fails Date: Tue, 29 Sep 2020 12:58:26 +0200 Message-Id: <20200929110018.954124659@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929110010.467764689@linuxfoundation.org> References: <20200929110010.467764689@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Pavel Machek [ Upstream commit 66be340f827554cb1c8a1ed7dea97920b4085af2 ] We should free resources in unlikely case of allocation failure. Signed-off-by: Pavel Machek Signed-off-by: Rob Clark Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/msm_drv.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 4558d66761b3c..108632a1f2438 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -444,8 +444,10 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv) if (!dev->dma_parms) { dev->dma_parms = devm_kzalloc(dev, sizeof(*dev->dma_parms), GFP_KERNEL); - if (!dev->dma_parms) - return -ENOMEM; + if (!dev->dma_parms) { + ret = -ENOMEM; + goto err_msm_uninit; + } } dma_set_max_seg_size(dev, DMA_BIT_MASK(32));