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=-16.1 required=3.0 tests=BAYES_00,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 497E1C43463 for ; Fri, 18 Sep 2020 03:04:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1820E206B7 for ; Fri, 18 Sep 2020 03:04:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600398260; bh=LoTtfgHtKtt1kt5u8RjyjW+2ok8FCys6Buytalzc7l8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zxnIfHqpFKWHf6k3laIZ2UKTI738gT/2NLafJVlkU8EbFtG50mgh2wGgiWZJJdhhz qfO1jhy85MM0DyWGWR0v6wlaZQ4cfe9FUWerLqk5VPW2DnIahOr+ZQ0jGLghlm/6Ja n7GhSEaOTcHBBQTKr3CszgO5eYS8jxxwPRbq9eUQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730589AbgIRDES (ORCPT ); Thu, 17 Sep 2020 23:04:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:52640 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726676AbgIRCEx (ORCPT ); Thu, 17 Sep 2020 22:04:53 -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 AFA7C2388B; Fri, 18 Sep 2020 02:04:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600394693; bh=LoTtfgHtKtt1kt5u8RjyjW+2ok8FCys6Buytalzc7l8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gF1A2NCwIsHSvJrB/uHiq4371tJtBYMTFeBH8Ong+HUvT0/OYXM1C3vwDNYvT4tKc Io+u6g+8+8zqutafzSvxsdRXrOz0lovbV88CAPUQTkaDYzmI2h0ZrgGxIlaoUWTumD o1VNublvJbmyP9Ia4orzhi6nTYuVD6xq1C8wCfiw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Pavel Machek , Rob Clark , Sasha Levin , dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.4 181/330] drm/msm: fix leaks if initialization fails Date: Thu, 17 Sep 2020 21:58:41 -0400 Message-Id: <20200918020110.2063155-181-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200918020110.2063155-1-sashal@kernel.org> References: <20200918020110.2063155-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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)); -- 2.25.1