Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp222519pxb; Mon, 13 Sep 2021 17:34:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw1UEZSa2BTiJH0NJuiYzRQif22v16cv/OIu7SG1DMv4ClT+Xy+WurgX1tnH72G4/DnDqaO X-Received: by 2002:a05:6402:1ac5:: with SMTP id ba5mr16563781edb.20.1631579650345; Mon, 13 Sep 2021 17:34:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631579650; cv=none; d=google.com; s=arc-20160816; b=l9FOCuVk2UwEdJSGpwb3g95TZBxCG231MLwGFFaONB3cJafoSc1jGbnc2947N92MVW Q08Uv/DxGDoS7wC9Q0UD7V/HZAMbhk3dlST6pX3+fHXOv0vtOmXBt2owMVPT/+8D9fXG z3BKa+/RiqLKcST3JUUSUdeqKEOLHIa4PQHkvO3ZgN3BNMVMim1OBtzckeFGw2Y05+sk CxiZKgtQj9OvqcZ25HMkYYQmbV462xSSD8LrVDW8KQtAZsAzbxoQtt3ouB7FfAPSAfij pfiJalybe/R0t6UafsE6aRs2MWsFx1PoPUcLem1fRJOZad510SoX4+0H8M6GGzd2L7xU JgCQ== 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=PTgVCadwJ/wv0Avii1qVssWYNlcwhzksNn44lKzwZ7o=; b=z37PHYklAcuNSzJ927mSyQbVLGBTWMCDLpjOM7+QxKj1uwnfYnR7EKZpUlN+kHjo4o fbNm9Ez9Y65NwIXoMlHFgnnmuvFTt+YVYr45+TQBVTttLoShJpp14jwBkmt8v9uI/Dy3 Fk4U+uJGs20rWgIImDXPJFKjDWH0JaVZ3J/rIDR7bpuPHqCxahX/+doOXkEwGmK2b8Dv 4sGpKB/CvGFTvtfPCMR+hUTyYlkrLQlSSVSl24N1bmqG9iHZwJEMrXZSnqFWClmJjUlK uUR5VTGBdDmZt5cF/ufzBu1eyrbAMG3w5S83rLczuP5zgZRFCuXYrtUhDKCePms/kf7H Bvqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=iyKDT7+L; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id mp36si10068689ejc.478.2021.09.13.17.33.47; Mon, 13 Sep 2021 17:34:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=iyKDT7+L; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S1345453AbhIMOi2 (ORCPT + 99 others); Mon, 13 Sep 2021 10:38:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:54212 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347415AbhIMOe2 (ORCPT ); Mon, 13 Sep 2021 10:34:28 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0F17C615E4; Mon, 13 Sep 2021 13:52:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631541177; bh=W37cmAp0BHodLE8g9kVNOnciBbSlzHICnpb+4rbV3Sg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iyKDT7+LUa8tVcKjIcrwf/ZY8wiUdS5WNJUwrJtBrs8h5E6JEYLXh3duUGovFqnTN xCmTC9KQACmQtRtSiGNKvt/grN2K2MU/OoS6RoAzQb1pbENdEtZ7oiIzfJYm1212GP irH1IEBsB5cNMLe3PV7Ib0Ka9AWN9r3obixXHW3s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe JAILLET , Rob Clark , Sasha Levin Subject: [PATCH 5.14 194/334] drm/msm/dsi: Fix some reference counted resource leaks Date: Mon, 13 Sep 2021 15:14:08 +0200 Message-Id: <20210913131119.944851520@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210913131113.390368911@linuxfoundation.org> References: <20210913131113.390368911@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christophe JAILLET [ Upstream commit 6977cc89c87506ff17e6c05f0e37f46752256e82 ] 'of_find_device_by_node()' takes a reference that must be released when not needed anymore. This is expected to be done in 'dsi_destroy()'. However, there are 2 issues in 'dsi_get_phy()'. First, if 'of_find_device_by_node()' succeeds but 'platform_get_drvdata()' returns NULL, 'msm_dsi->phy_dev' will still be NULL, and the reference won't be released in 'dsi_destroy()'. Secondly, as 'of_find_device_by_node()' already takes a reference, there is no need for an additional 'get_device()'. Move the assignment to 'msm_dsi->phy_dev' a few lines above and remove the unneeded 'get_device()' to solve both issues. Fixes: ec31abf6684e ("drm/msm/dsi: Separate PHY to another platform device") Signed-off-by: Christophe JAILLET Link: https://lore.kernel.org/r/f15bc57648a00e7c99f943903468a04639d50596.1628241097.git.christophe.jaillet@wanadoo.fr Signed-off-by: Rob Clark Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/dsi/dsi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c index 75afc12a7b25..29d11f1cb79b 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.c +++ b/drivers/gpu/drm/msm/dsi/dsi.c @@ -26,8 +26,10 @@ static int dsi_get_phy(struct msm_dsi *msm_dsi) } phy_pdev = of_find_device_by_node(phy_node); - if (phy_pdev) + if (phy_pdev) { msm_dsi->phy = platform_get_drvdata(phy_pdev); + msm_dsi->phy_dev = &phy_pdev->dev; + } of_node_put(phy_node); @@ -36,8 +38,6 @@ static int dsi_get_phy(struct msm_dsi *msm_dsi) return -EPROBE_DEFER; } - msm_dsi->phy_dev = get_device(&phy_pdev->dev); - return 0; } -- 2.30.2