Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp3804243pxb; Tue, 19 Apr 2022 10:07:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzmx1N9EQRyS+JoDTl8hb0OevFYhI+lk6qm1bLzUaViqTQbez9hf6X/b1e2clBDyyMr23Uf X-Received: by 2002:a05:6402:278f:b0:423:9407:9948 with SMTP id b15-20020a056402278f00b0042394079948mr18023137ede.294.1650388064170; Tue, 19 Apr 2022 10:07:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650388064; cv=none; d=google.com; s=arc-20160816; b=iNj+PoZa17vUcJ4dqOmLX/vqAVMPjZo2slM3BefCgb07nGWzvZMq8wdBqmAWi1FSbM Lbhnw4j2d0Yb+xT73jIqYSKqsP2LHN4PmCBr7MMo1GL6EZMjFYyF6sQnvjbkaFukiT2+ FGtdc+rHf+5ypm0UeJgCY3l4W0LpGxr0NEThpLPgvptq4nWqv+7lnfR/iWhFpWGbH6By SXZVwiYXtvqm0f2zRx+zOBX5z1ZCPMYjjEY1/myLDW65cdHd0+LBNpxQsDzau6X4jXTI cm7ciAwGDRGqqAdKNfSD6371i7J5Vq+X+9qItFrgveVOqYbPz+XYhMI41fYZXLQsahDK LgJQ== 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=FAtOD5x1IFefUKG/rLGOSN8cz0vA7vvVKNTI2MAfyEw=; b=c1lCHZd++XTVVFkQ1nAwt5nTUjPW59fgnOjdNCaByX5O7B+Zm8dkZ/RhdtG4TCl/Yr 3mDC9MfqzKfzSGdzODg8O7bMUghvnZ5dtGOHU22YMvxqLx2clfqYOicTdcyJPsUdfIyY xJ+/cCJN8DqNjUZDHh8motvWrae1RcweNqJEOgjPOqCqRoJBxpguXswkHi0wh7SQNUER Q9EbXaYk/ybmaB7c8UzvRmjWe8JCxpmDNj2qGB8Ky8R/fA243UYTSBTmu62KGJxZtHa4 ZJeEykSUPoc3K/OO3efg0eIHsKuEdKezymnW+tlTkofQTFm9dudRsfAS3jTF3FX8C4ky /oJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=fvumhso2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sa13-20020a1709076d0d00b006e89bbfc6cfsi5991301ejc.908.2022.04.19.10.07.18; Tue, 19 Apr 2022 10:07:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=fvumhso2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244872AbiDRO0E (ORCPT + 99 others); Mon, 18 Apr 2022 10:26:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34454 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343604AbiDROOg (ORCPT ); Mon, 18 Apr 2022 10:14:36 -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 7299838786; Mon, 18 Apr 2022 06:12:12 -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 19449B80EC4; Mon, 18 Apr 2022 13:12:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4AAA4C385A1; Mon, 18 Apr 2022 13:12:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1650287529; bh=LpqM6oePim4exxIdXfgoXKwgQgXWjEEDgaXDQZkm/BQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fvumhso2YawudUuli0cyOfeeLC6QTY/42PdoDp20bdGC5Eo3JxQqMDz+RsnRgB1JN hIgZrd3KyNIgrsQCDzv9ZcfGxWGBqB+u1sCT39nt0yDNIErVCusKBkepxLHfEtz6om xBYNtu7v4HaQh8j1bVkc1RrGbNGeYLV5qOlqpWKo= 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 4.9 190/218] drm/imx: Fix memory leak in imx_pd_connector_get_modes Date: Mon, 18 Apr 2022 14:14:16 +0200 Message-Id: <20220418121206.717081148@linuxfoundation.org> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220418121158.636999985@linuxfoundation.org> References: <20220418121158.636999985@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=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham 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 d796ada2a47a..924a11232b84 100644 --- a/drivers/gpu/drm/imx/parallel-display.c +++ b/drivers/gpu/drm/imx/parallel-display.c @@ -83,8 +83,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