Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp793687pxb; Tue, 12 Apr 2022 13:37:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz18+9ZvkWdiFCUiexlLe4hcO259rkXE3z7F4SssK16Lvb6AbZPwm0cIt6p6932umUKxbLP X-Received: by 2002:a17:90b:4a83:b0:1c6:f037:bc73 with SMTP id lp3-20020a17090b4a8300b001c6f037bc73mr6955068pjb.44.1649795873831; Tue, 12 Apr 2022 13:37:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649795873; cv=none; d=google.com; s=arc-20160816; b=I+3n/U/l++Nz28ewrGsO2HRMvOcFQZ9h2qgUAsDzW4OvZ22WVlAP4+2CxyQQ3hFf+m d7jx955dOlUV4sgdkX04mOav848TyhcIGoeMCmIG0IjDQLZNuSv13tD4nuyq3RvhKswy cbSGKIy2a6B5xYS00TcU995prUyc1qXkhLE3S9m/+EJmooz5evfQuvr5yNDkAKepVtPj J7LP7wf163vG2sYH7rnBMH1Gw0b5MIefhHJX0uHtjXGagj7OKQLM2ohRUG1WDpbqjEGQ 5/aFY+GUSJvGaoavNrdmxULWGbRDEZNTWohK/xuSVT3g+mB/tfnlNXvrtbtZW3cOuKI0 B3bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=AIRCmo0vuLRZUzJAjuAPxttH8mDiMr4gwMqux/ItXkI=; b=yVheR5tGBnW8rjy0e4pcX32MsbWoEWAOunIWHtfAzoZAncXIkOZMLhd50a/pbnThQo oiCo+LbWfx+rk6tcGlXSN4h5O9vsfgaFj1xoT+F5TMJqAtEhuI1dSChJnf2AHD41UvAB M/ZCrebLrA8TqBgUK6YKF/au4u9DU3cnmZfFATxlxamg6GA986lnPSokbnofdLPbYL8X eJ1TYCf46dZhXEF51bFjoGtxQFpU1aDTUChewfzkpDgNEEP9QXXUipIwbgMR3eoC4nen QHQ6cjvQLVFr9iZJDm997PsfAYCTXP/wV77KSCB0VenfGK3JqUfB8shKyfVhmMGFGGfu 3o+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=NuYc2yme; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id r29-20020a63441d000000b003820cbdac6bsi3561289pga.395.2022.04.12.13.37.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 13:37:53 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=NuYc2yme; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 521B0AD116; Tue, 12 Apr 2022 13:11:40 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350685AbiDLGtD (ORCPT + 99 others); Tue, 12 Apr 2022 02:49:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351286AbiDLGo3 (ORCPT ); Tue, 12 Apr 2022 02:44:29 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44A64186FA; Mon, 11 Apr 2022 23:37:58 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 07771B818C8; Tue, 12 Apr 2022 06:37:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6F198C385B9; Tue, 12 Apr 2022 06:37:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649745475; bh=laELWDI1wTDAkerjX+EijK0x01hpcBvuttqH+rvEt50=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NuYc2ymeWIrX2cYxKQNROemidTu8p2n613EBMa1MPiufWwrapQgWbt6OaWK3S1781 0as+n7o8L3LM/RQZan36YFKuKsxTLNxeI7Jy5ko1+1BLi7mbaTIpa5UmvsaCuAYjN8 UaCb1pJbi6AdvKC8b32unokc01GZD7/i9+drf5MI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= , Philipp Zabel , Sasha Levin Subject: [PATCH 5.10 108/171] drm/imx: Fix memory leak in imx_pd_connector_get_modes Date: Tue, 12 Apr 2022 08:29:59 +0200 Message-Id: <20220412062931.007919853@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412062927.870347203@linuxfoundation.org> References: <20220412062927.870347203@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: José Expósito [ Upstream commit bce81feb03a20fca7bbdd1c4af16b4e9d5c0e1d3 ] Avoid leaking the display mode variable if of_get_drm_display_mode fails. Fixes: 76ecd9c9fb24 ("drm/imx: parallel-display: check return code from of_get_drm_display_mode()") Addresses-Coverity-ID: 1443943 ("Resource leak") Signed-off-by: José Expósito Signed-off-by: Philipp Zabel Link: https://lore.kernel.org/r/20220108165230.44610-1-jose.exposito89@gmail.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/imx/parallel-display.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c index 605ac8825a59..b61bfa84b6bb 100644 --- a/drivers/gpu/drm/imx/parallel-display.c +++ b/drivers/gpu/drm/imx/parallel-display.c @@ -70,8 +70,10 @@ static int imx_pd_connector_get_modes(struct drm_connector *connector) ret = of_get_drm_display_mode(np, &imxpd->mode, &imxpd->bus_flags, OF_USE_NATIVE_MODE); - if (ret) + if (ret) { + drm_mode_destroy(connector->dev, mode); return ret; + } drm_mode_copy(mode, &imxpd->mode); mode->type |= DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED, -- 2.35.1