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,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 812CBC2BA19 for ; Sat, 11 Apr 2020 23:36:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 444F02051A for ; Sat, 11 Apr 2020 23:36:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586648163; bh=zO9NIZVCPOtaiviKW3t3J8W4QlZgrYLr+If0YV6RfgM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JZywmMLhG0zYzohC/72eSsLX12dhMfwtGGjSRgjZ50zzWRvA9FjMeyEYjfq54ztko d+LtL57UwK2+wf46qCfaOBuFY+IgpFMWuoAk0LIRAHVYmInWPc8+CobTwcZdN42cdz vrmyTArcI2rtcAXd4Z4H5jEDwhsxNsl7cwUIe9e0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730287AbgDKXgB (ORCPT ); Sat, 11 Apr 2020 19:36:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:46046 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728539AbgDKXIt (ORCPT ); Sat, 11 Apr 2020 19:08:49 -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 F1417218AC; Sat, 11 Apr 2020 23:08:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586646529; bh=zO9NIZVCPOtaiviKW3t3J8W4QlZgrYLr+If0YV6RfgM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gCTF/q3Jtp/VN1RaqcpsrkqEctsjJLwbS22xmUFNKO8JCxkHbIC3oKHUHGbC9Xat+ hHoa+Ege+eV5zw8Jm63oI0uQFR84Mq5xQWQq4+FdMbBJpKfiluzM5Tr1fGAT3wwGnD tWZk+jG+OG9O2i67bM5Tfpw/pyjPveqPHmrdZ9qc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Pavel Machek , Rob Clark , Sasha Levin , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.5 084/121] drm/msm: fix leaks if initialization fails Date: Sat, 11 Apr 2020 19:06:29 -0400 Message-Id: <20200411230706.23855-84-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200411230706.23855-1-sashal@kernel.org> References: <20200411230706.23855-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: 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 b73fbb65e14b2..68785ee02e97c 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.20.1