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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 0AE58C47082 for ; Wed, 26 May 2021 15:18:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D34C660FE3 for ; Wed, 26 May 2021 15:18:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235400AbhEZPUP (ORCPT ); Wed, 26 May 2021 11:20:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235214AbhEZPUM (ORCPT ); Wed, 26 May 2021 11:20:12 -0400 Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38836C061756; Wed, 26 May 2021 08:18:40 -0700 (PDT) Received: by mail-pg1-x52e.google.com with SMTP id l70so1238895pga.1; Wed, 26 May 2021 08:18:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=vIk6t88cCvmSuMsBu2gfTbOYGwvE82URMCwvqXMpv70=; b=IlbfFzdOX0zi4Cay4brwe12Sg1xnWv2vcPd+ByXjspk18yS5WZAATgINRrHKZYyMiX 3HTjx7jQbC+VSnWdBoi6Esd6yhTKoZ8mkkuoqcJl2s9RbuPYpLtFQRIsR/a7i1l56HRA 78HJNxT1AU1BjfnOEnHGFVDlHs14XVhueY6SwYwTmxo7MUPpofxAw4nWq+S2WK4KpGnU dBnMNrhFs6e7n5R7UZvtRQ5A1pVLgusH7SeMFiaMeP3VnfX+g6FYT5bFhZ++LkpJnmwB Lb8SoGqrHWvZ5sArnLugPyYZ+zXDdseTNBMUyF1KCmHeXx49Ds7HuWAk7UVzGkdfYNey GUjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=vIk6t88cCvmSuMsBu2gfTbOYGwvE82URMCwvqXMpv70=; b=Uv856LTLPg8M98+W1+XaEnyKkhnl2R+GzA3prRGGR+DyCtD8UE2+C9Tf8p2baXY051 LKex/lH69twe9AsRdfYZSDgQPhjg7iNlJFI8h6qeQ/s+Wf62GahkK7CZqmrkHpmLXOQq ee/xaLypKTJ/G8hCMT+RP+Zr8Q3hrXKv2ErRjOydlV9fflgTYEFQCTSuOM3oBCtnTFpA kXHF4Nt95RbGUCxEaUQW6OUVIukYALG7EZYrTWQWhDHBNNLQ0laXEdRLRnRL78vs+J6a sXOm6kuS4bvTmYVLM3W7gq4bcXBzCFSTAubXAYGSlDH1Dok01E2lHH85+FCyAlAJpAMm ByzQ== X-Gm-Message-State: AOAM530imQ1gn4eUlurYtWUju9bK388J1ZAx/Ct7nkWw2NqqBItqAEqF 2tHFy8FsDB6rHzCYnIzNahg= X-Google-Smtp-Source: ABdhPJx2XrHSdXqKFZY7P74N6tSTIz1ym1YjtPFp5WtB8jlA5XSv73Lav5dcZsWpfPZm/1z+dBN+hw== X-Received: by 2002:a63:ed41:: with SMTP id m1mr25433071pgk.252.1622042319794; Wed, 26 May 2021 08:18:39 -0700 (PDT) Received: from localhost.localdomain ([23.104.213.5]) by smtp.gmail.com with ESMTPSA id d3sm16597643pfn.141.2021.05.26.08.18.36 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 May 2021 08:18:38 -0700 (PDT) From: dillon.minfei@gmail.com To: mchehab+huawei@kernel.org, hverkuil-cisco@xs4all.nl, a.hajda@samsung.com, mchehab@kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Dillon Min Subject: [PATCH v2] media: s5p-g2d: Fix a memory leak on ctx->fh.m2m_ctx Date: Wed, 26 May 2021 23:18:32 +0800 Message-Id: <1622042312-4325-1-git-send-email-dillon.minfei@gmail.com> X-Mailer: git-send-email 1.9.1 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dillon Min The m2m_ctx resources was allocated by v4l2_m2m_ctx_init() in g2d_open() should be freed from g2d_release() when it's not used. Fix it Fixes: 918847341af0 ("[media] v4l: add G2D driver for s5p device family") Signed-off-by: Dillon Min --- v2: move v4l2_m2m_ctx_release() up to v4l2_ctrl_handler() from Hans's suggestion, thanks. drivers/media/platform/s5p-g2d/g2d.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/media/platform/s5p-g2d/g2d.c b/drivers/media/platform/s5p-g2d/g2d.c index 15bcb7f6e113..1cb5eaabf340 100644 --- a/drivers/media/platform/s5p-g2d/g2d.c +++ b/drivers/media/platform/s5p-g2d/g2d.c @@ -276,6 +276,9 @@ static int g2d_release(struct file *file) struct g2d_dev *dev = video_drvdata(file); struct g2d_ctx *ctx = fh2ctx(file->private_data); + mutex_lock(&dev->mutex); + v4l2_m2m_ctx_release(ctx->fh.m2m_ctx); + mutex_unlock(&dev->mutex); v4l2_ctrl_handler_free(&ctx->ctrl_handler); v4l2_fh_del(&ctx->fh); v4l2_fh_exit(&ctx->fh); -- 1.9.1 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=-13.8 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 2305AC47082 for ; Wed, 26 May 2021 16:35:05 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DB01D60FE3 for ; Wed, 26 May 2021 16:35:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DB01D60FE3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date:Subject:Cc:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=7HxRswT2Cnr4xAQbErfMxhYolPGRddTXPKKUEs9ZwGE=; b=mincD3xkwg4iSp mOdQmuqtiHjYydAWgRRWM2qbtrIIBVXfB5YVgvZLMYZu9aROROzX6FquGLdLI7waIffsv/s23Ulu4 n8hLpKHE8EVW+tRRQo6SxvIKElZ4NhkPlvq8wkTpZ9hskByPEz8TabU2ItzYZmi/xDOFi1KV8S0Ic H5S8apPidfaMMgunvaOEaApMotG54Dpr7OxDpHhRycB0ucH7+j2xKlIKawyziDsmARSKUn4fCU6p7 fPyJwZeplvkcGSnlyjbbVEtD+5/JgnqS4PrfdYGd/ooXLybiU3V/U5rrfTOL3PU0OiUjKYk8RjJzP yh4BcVGspTBNGUCqhzWQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1llwSM-00FlGh-JF; Wed, 26 May 2021 16:32:32 +0000 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1llvIu-00FI9Y-UH for linux-arm-kernel@lists.infradead.org; Wed, 26 May 2021 15:18:42 +0000 Received: by mail-pf1-x429.google.com with SMTP id q25so1177215pfn.1 for ; Wed, 26 May 2021 08:18:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=vIk6t88cCvmSuMsBu2gfTbOYGwvE82URMCwvqXMpv70=; b=IlbfFzdOX0zi4Cay4brwe12Sg1xnWv2vcPd+ByXjspk18yS5WZAATgINRrHKZYyMiX 3HTjx7jQbC+VSnWdBoi6Esd6yhTKoZ8mkkuoqcJl2s9RbuPYpLtFQRIsR/a7i1l56HRA 78HJNxT1AU1BjfnOEnHGFVDlHs14XVhueY6SwYwTmxo7MUPpofxAw4nWq+S2WK4KpGnU dBnMNrhFs6e7n5R7UZvtRQ5A1pVLgusH7SeMFiaMeP3VnfX+g6FYT5bFhZ++LkpJnmwB Lb8SoGqrHWvZ5sArnLugPyYZ+zXDdseTNBMUyF1KCmHeXx49Ds7HuWAk7UVzGkdfYNey GUjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=vIk6t88cCvmSuMsBu2gfTbOYGwvE82URMCwvqXMpv70=; b=tGjZY0TaKkayZycdZoQ6DRH9+TUxOEWvFYr9Bx4MF3qE4KLc4YGk9rdPvHXysX/Fi5 OcYMTbjgsA8uANCG5bLDO3jeqzm4T2p6L952eVJ0NIwD0dSpIKuUgdJxHfDIJaYvs0+o AazPD8kzAIRgyu6/MRrQdOe3+/deKo32lSkoWBvDo9tnaaXQaTgzAVtkfaqb2bGuveiF p+Zi1+os0gHV3ROZkfrjoBUkXx9+xQbyfMxcMwXnnMgqVctTChF+PvKUkJEABCu45h0H UGPhfsXV5tBT89CwrFfgp406vWiJmT5Onqqw+tg6CxDvNBZA/+HhpAFJa0VWUgqmbmBG pJrQ== X-Gm-Message-State: AOAM5334VzA3lAIdfLpd4ZuOiT8ufHrRop0vHXKPXPeziLKe+V3dVzrv 5R7tvePbnb36b2DxMKp1rRc= X-Google-Smtp-Source: ABdhPJx2XrHSdXqKFZY7P74N6tSTIz1ym1YjtPFp5WtB8jlA5XSv73Lav5dcZsWpfPZm/1z+dBN+hw== X-Received: by 2002:a63:ed41:: with SMTP id m1mr25433071pgk.252.1622042319794; Wed, 26 May 2021 08:18:39 -0700 (PDT) Received: from localhost.localdomain ([23.104.213.5]) by smtp.gmail.com with ESMTPSA id d3sm16597643pfn.141.2021.05.26.08.18.36 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 May 2021 08:18:38 -0700 (PDT) From: dillon.minfei@gmail.com To: mchehab+huawei@kernel.org, hverkuil-cisco@xs4all.nl, a.hajda@samsung.com, mchehab@kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Dillon Min Subject: [PATCH v2] media: s5p-g2d: Fix a memory leak on ctx->fh.m2m_ctx Date: Wed, 26 May 2021 23:18:32 +0800 Message-Id: <1622042312-4325-1-git-send-email-dillon.minfei@gmail.com> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210526_081841_022750_193E9A0B X-CRM114-Status: GOOD ( 11.85 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Dillon Min The m2m_ctx resources was allocated by v4l2_m2m_ctx_init() in g2d_open() should be freed from g2d_release() when it's not used. Fix it Fixes: 918847341af0 ("[media] v4l: add G2D driver for s5p device family") Signed-off-by: Dillon Min --- v2: move v4l2_m2m_ctx_release() up to v4l2_ctrl_handler() from Hans's suggestion, thanks. drivers/media/platform/s5p-g2d/g2d.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/media/platform/s5p-g2d/g2d.c b/drivers/media/platform/s5p-g2d/g2d.c index 15bcb7f6e113..1cb5eaabf340 100644 --- a/drivers/media/platform/s5p-g2d/g2d.c +++ b/drivers/media/platform/s5p-g2d/g2d.c @@ -276,6 +276,9 @@ static int g2d_release(struct file *file) struct g2d_dev *dev = video_drvdata(file); struct g2d_ctx *ctx = fh2ctx(file->private_data); + mutex_lock(&dev->mutex); + v4l2_m2m_ctx_release(ctx->fh.m2m_ctx); + mutex_unlock(&dev->mutex); v4l2_ctrl_handler_free(&ctx->ctrl_handler); v4l2_fh_del(&ctx->fh); v4l2_fh_exit(&ctx->fh); -- 1.9.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel