From patchwork Tue Sep 29 10:59:27 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: 262978 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 5C813C4727F for ; Tue, 29 Sep 2020 12:29:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0A09A2083B for ; Tue, 29 Sep 2020 12:29:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601382542; bh=MwGFtKWSGpn1CofDZXm/j7WAMuhx+zTxLN826jRE7rE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Gw5Jbpfpt9yvmGla3Du+qqTgCxUgvyvBv2SDbfGlA6hkYNZEfUabAWUXkVXQcJ9NI I2zZqNJ6Myg77LX1h2SQ77e/g/N3VRQF5rStAckmCdZPd3hrQ7D18RFXS7D7xPdh6h fr2hH6wxt8RZISihz2Z6QTGVmIIqJg/pRNTZRdj8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732835AbgI2M2m (ORCPT ); Tue, 29 Sep 2020 08:28:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:49122 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729112AbgI2LcX (ORCPT ); Tue, 29 Sep 2020 07:32:23 -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 CCCE823B1C; Tue, 29 Sep 2020 11:25:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601378723; bh=MwGFtKWSGpn1CofDZXm/j7WAMuhx+zTxLN826jRE7rE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=v9nSCoNOObCjrweGww4JgrSDUxCXfqxUBdEVX6pqKrlc3n6kkxYxHjoiuZJ2X1r93 I384DRBi4ktsdsmVrZcBnj7WB9mB4QT5HkQ2Uk3/84MA3yEn5whVbKs/3dEf3oDUF1 sN2Sr9ltiAbCHiWXlOzonPqJrZDsUSnhtytP5ReE= 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 4.19 116/245] drm/msm: fix leaks if initialization fails Date: Tue, 29 Sep 2020 12:59:27 +0200 Message-Id: <20200929105952.630300573@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929105946.978650816@linuxfoundation.org> References: <20200929105946.978650816@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 7f45486b6650b..3ba3ae9749bec 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -495,8 +495,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));