Message ID | 20230914131058.2472260-1-jani.nikula@intel.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp389351vqi; Thu, 14 Sep 2023 07:30:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE6bcztsG8oJ4Ozsgo3YarQidHx9cBxhvXDodmojbiNi6S/f3tZ8mTC10YyUvo8w4wJaR5B X-Received: by 2002:a17:903:22c7:b0:1c3:4073:bf80 with SMTP id y7-20020a17090322c700b001c34073bf80mr6349391plg.0.1694701803220; Thu, 14 Sep 2023 07:30:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694701803; cv=none; d=google.com; s=arc-20160816; b=yr1iAKV4So64Whx/Va/izCY5aCw9DAEJJRwukwTd+2fI7cQG4awISnRfFsWbsgyPhP QUxbzm+wxkErKo3BMYRRS9BR726Pa4lEkdzHMdYdmZJDml/+cPShJZqzBzoldJUpmCOA q8g5kUbjOa8AiK1us05iB1zp2jX18qjLX3BcIMDRCDhSBAvPvEsK9Kku0ZUFXqB7mPoh Kqnzkkzc/Fzk11IT6wj1IbBWcvDQP5MHUMqmtBaauGENWZiPodLccRyXFjMChG6bfn/9 b1tjXlwXDImTSCfAZrO8LaMUgcC2i7iG8HlOF5WL6sg9C3U2UYnrf13s4RWNYN3bKnPa usmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:organization :mime-version:message-id:date:subject:cc:to:from:dkim-signature; bh=AaRGJ1kf12rVln3LsRgrnbnCAaf0LvAvi5fzIfjrvRg=; fh=0SaWTVTSYL8AyLU3D9e7/bFU+SkUOKZboSq1++orn+M=; b=h8+dFg5562cr7h5Sj2LfggVlpi8lErunarEthQ6z4HfZSR2Why/yjOvZ8NLgcs0ISR v/8ANb/+iIJKlGWcW4K43JzpK6+rkSXytvSErZqcnpxIpH9ePt0XfThmd8vPolkOSow8 QHYdQ5qVSD8HAm+XJWpXwh5+XtTga/WK7pJE7ZlhJG+01vIRv/puyDm86YgaCJHdVvhb it4GUzx38yvINiRHWPNfDuU1ROg3o8ACfLMHcVHb/673m7R8De1qwXzQAaa0ibr/WKoR 7wk0/AdhtitudIJTMDrSRYakBRQ0OMQXUIGXbbvaRNTMq4FX7fb4W3Bx7q7lUyPXxkmu o7tw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=j6J0doqN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id u7-20020a170903124700b001bdc664cd5fsi1973060plh.168.2023.09.14.07.30.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 07:30:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=j6J0doqN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 30D0B8260AC3; Thu, 14 Sep 2023 06:13:47 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238756AbjINNNi (ORCPT <rfc822;chrisfriedt@gmail.com> + 35 others); Thu, 14 Sep 2023 09:13:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45042 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238623AbjINNNh (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 14 Sep 2023 09:13:37 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1E111A5; Thu, 14 Sep 2023 06:13:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694697213; x=1726233213; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=7XDGJ0Ht6oXKb4r3a9CM/U+PgCZCGhp2zPWfhO1jsQk=; b=j6J0doqN7lPllJRVcBw/dc6idl1a2xJ+DnZpbsJvCkKCd59Rwxj+1ZUg bVz5l2Ex7YeGsg0Ts4yRokrGKIRhZwf9Fp81S/CnpOOw7Cu14OwtdvG9A 7SdtkzIJKle1rodaDCM+1rcxw8WeGlG/4ARi0MZ5w0gTp+Avyv+nc2Qyj Ym/LMszqCfErlBJGBb7x1EkjdLw0UO1EPoO6B3HYdPR/zvdp1r23zOnfd IipUJLck8TtzxlcOuZZT//Q7PJImlPecGCH29tN8AZBkbrWP1cD7ymNLh 7b2Ybycj0LxWiQWhlVZRek+zXoPjaKXf2sosgktsrrtWv5fGGwSRkrBmE g==; X-IronPort-AV: E=McAfee;i="6600,9927,10833"; a="376281301" X-IronPort-AV: E=Sophos;i="6.02,146,1688454000"; d="scan'208";a="376281301" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Sep 2023 06:11:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10833"; a="887801992" X-IronPort-AV: E=Sophos;i="6.02,146,1688454000"; d="scan'208";a="887801992" Received: from jnikula-mobl4.fi.intel.com (HELO localhost) ([10.237.66.162]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Sep 2023 06:10:31 -0700 From: Jani Nikula <jani.nikula@intel.com> To: dri-devel@lists.freedesktop.org Cc: jani.nikula@intel.com, Markus Schneider-Pargmann <msp@baylibre.com>, Guillaume Ranquet <granquet@baylibre.com>, Bo-Chen Chen <rex-bc.chen@mediatek.com>, CK Hu <ck.hu@mediatek.com>, AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>, Dmitry Osipenko <dmitry.osipenko@collabora.com>, Chun-Kuang Hu <chunkuang.hu@kernel.org>, Philipp Zabel <p.zabel@pengutronix.de>, Matthias Brugger <matthias.bgg@gmail.com>, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, stable@vger.kernel.org Subject: [PATCH] drm/mediatek/dp: fix memory leak on ->get_edid callback error path Date: Thu, 14 Sep 2023 16:10:58 +0300 Message-Id: <20230914131058.2472260-1-jani.nikula@intel.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Thu, 14 Sep 2023 06:13:47 -0700 (PDT) X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777021756568629280 X-GMAIL-MSGID: 1777023638000684175 |
Series |
drm/mediatek/dp: fix memory leak on ->get_edid callback error path
|
|
Commit Message
Jani Nikula
Sept. 14, 2023, 1:10 p.m. UTC
Setting new_edid to NULL leaks the buffer.
Fixes: f70ac097a2cf ("drm/mediatek: Add MT8195 Embedded DisplayPort driver")
Cc: Markus Schneider-Pargmann <msp@baylibre.com>
Cc: Guillaume Ranquet <granquet@baylibre.com>
Cc: Bo-Chen Chen <rex-bc.chen@mediatek.com>
Cc: CK Hu <ck.hu@mediatek.com>
Cc: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Cc: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Cc: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: dri-devel@lists.freedesktop.org
Cc: linux-mediatek@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: <stable@vger.kernel.org> # v6.1+
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
UNTESTED
---
drivers/gpu/drm/mediatek/mtk_dp.c | 1 +
1 file changed, 1 insertion(+)
Comments
Hi, Jani: Jani Nikula <jani.nikula@intel.com> 於 2023年9月14日 週四 下午9:13寫道: > > Setting new_edid to NULL leaks the buffer. Applied to mediatek-drm-next [1], thanks. [1] https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux.git/log/?h=mediatek-drm-next Regards, Chun-Kuang. > > Fixes: f70ac097a2cf ("drm/mediatek: Add MT8195 Embedded DisplayPort driver") > Cc: Markus Schneider-Pargmann <msp@baylibre.com> > Cc: Guillaume Ranquet <granquet@baylibre.com> > Cc: Bo-Chen Chen <rex-bc.chen@mediatek.com> > Cc: CK Hu <ck.hu@mediatek.com> > Cc: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > Cc: Dmitry Osipenko <dmitry.osipenko@collabora.com> > Cc: Chun-Kuang Hu <chunkuang.hu@kernel.org> > Cc: Philipp Zabel <p.zabel@pengutronix.de> > Cc: Matthias Brugger <matthias.bgg@gmail.com> > Cc: dri-devel@lists.freedesktop.org > Cc: linux-mediatek@lists.infradead.org > Cc: linux-kernel@vger.kernel.org > Cc: linux-arm-kernel@lists.infradead.org > Cc: <stable@vger.kernel.org> # v6.1+ > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > > --- > > UNTESTED > --- > drivers/gpu/drm/mediatek/mtk_dp.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/gpu/drm/mediatek/mtk_dp.c b/drivers/gpu/drm/mediatek/mtk_dp.c > index 2cb47f663756..8fc6eff68e30 100644 > --- a/drivers/gpu/drm/mediatek/mtk_dp.c > +++ b/drivers/gpu/drm/mediatek/mtk_dp.c > @@ -2049,6 +2049,7 @@ static struct edid *mtk_dp_get_edid(struct drm_bridge *bridge, > */ > if (mtk_dp_parse_capabilities(mtk_dp)) { > drm_err(mtk_dp->drm_dev, "Can't parse capabilities\n"); > + kfree(new_edid); > new_edid = NULL; > } > > -- > 2.39.2 >
diff --git a/drivers/gpu/drm/mediatek/mtk_dp.c b/drivers/gpu/drm/mediatek/mtk_dp.c index 2cb47f663756..8fc6eff68e30 100644 --- a/drivers/gpu/drm/mediatek/mtk_dp.c +++ b/drivers/gpu/drm/mediatek/mtk_dp.c @@ -2049,6 +2049,7 @@ static struct edid *mtk_dp_get_edid(struct drm_bridge *bridge, */ if (mtk_dp_parse_capabilities(mtk_dp)) { drm_err(mtk_dp->drm_dev, "Can't parse capabilities\n"); + kfree(new_edid); new_edid = NULL; }