From nobody Thu Apr 2 14:20:18 2026 Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 92FA122578D for ; Sat, 28 Mar 2026 17:06:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774717621; cv=none; b=gw/lXC9flTcDuO0HsiZllQpw4tko2pe7cdW+zORr6G7pC3u6Bm3V5hoW/YAqnqc/YgV7F9MvgWBvEHtkUyqKtGdESAWVNRvc6YPXzXBdtPUuQy19/ugUTJ5xOKAKg2hC2sjsL9faSTQoWF5pUHpgGP37QOlvVlwiYAqwOxD7OSQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774717621; c=relaxed/simple; bh=DllPNEY5HJhelRRWtMlz2dJNBymbUWyXeyN0iDUfRcY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=bh3A6fPzbyQgwVRjRsiY/rsrt6M2g7vUNJJAJry39hKOyXqfOuboBAJ7+GbXQz0lP+ePWpdnL2G3iCgMOLXbtkMk82qPDwQh3hwNTaCfyGIoMChI1k7PwR91ojj+/yOTg9k9Bg/ndDqujMFnyEA8S3QoBqnficM75mkiBwPwVoQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=D8wHCa+L; arc=none smtp.client-ip=209.85.218.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="D8wHCa+L" Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-b886fc047d5so511156766b.3 for ; Sat, 28 Mar 2026 10:06:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774717618; x=1775322418; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=K5w1Y1b3TwAv79lqz5JishdxGsbpyNm4BW0hPIUDQcY=; b=D8wHCa+LZWIWB+xrd/8dUo+LCcYj7zvxNDYizg4sX5Pv3IoAja7owYIg433Bd1tHkE Ay2XBKwj/KdlrANtMh7GklGhaw6LCF+qclWeYs3Dn0c8Sz1adrwcFJP3SGnA/H0ffyUp MaN7FRZfqCf2OlOCtdyosLeRiro/kQiEhw3wAIxYA1kzu99AaKdJwN/hFWz+irPW4nNA KPjcYlYcvn2MIKi7qJHyZZW5chg3Ne/Io0HK2lIPy++eXwGfH7mtTHe3kCC79LBWfpN1 aGyd8bTnrcz+z+fFUx4GpGSa0+NP8sgtyJ9EikCGWgqZ/is6xKUKwFh1dfsarKpLz+Ar tx3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774717618; x=1775322418; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=K5w1Y1b3TwAv79lqz5JishdxGsbpyNm4BW0hPIUDQcY=; b=kyx6lrZ/A+CbwGrlgZ6XaV/Tm1yieD3XpzODemEt30Pmv6mkmYTGLtxdJ3RbqDUOCW 3kUZaR7Gtuy2IqFClYxwYbhqF6sgT8XpgZvVkQFHyh2Ir8I1uanzX+JB4YbIurHGSpME KjfYXhW31QXqoAPhBQ1XrP/cnWNXW5jiwbyXP6a3LTkfVcTKVyQT/1dibzxgG21EOmK2 JVrSd7bGkPpV8Qc0uyMpppfZHaO+48r5SE6ja//L3/4hWtvXjAFdlJ2KGoZJC+hdSrCZ /2+72upTWVc19HWeRQwd/1HtRyVsyVRYvfs3mRov5ZrC3/y62KNhzLuJKY/0syIkS+aN 6KmQ== X-Forwarded-Encrypted: i=1; AJvYcCXwlBZbUld27TXTT45Xj1Y9uoiJ9zkRVG2GIjEQC7lGvFkobW1cpqRA+Mm6FR41JEknIfvrmajL5BGcHOo=@vger.kernel.org X-Gm-Message-State: AOJu0Yy9Zw31cA+nQ/YCYd3jDhrqLHTFZCI5SX68rSb0dZbzpi2KKVVE wdfH6LCfqzzfqRo9+AmO6c1nWIt2DQ1M+BPVNr3PspnRc5WCH53lxrkxaIUGZnz0b7srtA== X-Gm-Gg: ATEYQzzIawQ4yykgC1WwExmeY7ZbnjuZ3pmrbxqliCt8Xw5zG77KIzOXFKuLrE5B3w3 H2MjprtUECzzx4Igw6x+PnhHTUQiBfZz3qyiG/DHKKV7vvtIq2AoYCE/gMOVweV+e1g42ShCfqY z+43H6GfTQZUAzZN25uDXQNRV0sPvsUTVBIDDKlfuNva+1ewwZj7dUeE71Y8x+FS+CLS1kqJDnz oGntA8OH7fjePBxjDYRw7BymCTWoyVrw+we/F5GCpjaiJovSxVw2VpOFrTX2l8yw7LaNy8jr+xx MAmKyYT3dXvF4KuJjR0tjNhzwOxDLh34jJn1yCd81F7XrDc67B1VQ6lyIUfll7whC5ECudZEqrj HiVEW5FvGmO4mCY1zK7x6KoS0gOWMUoFstuirjgmrvjdlivFlQ2B1wIvF3U0PL5IXzv2BGVsZSS 0BgQwXqppUZ1mtUDoWBY4K+0He10qyuNFL/w6ybmH6suAiBS3uLUfitXFXfr5nLuaBuW6IB712v BZfuCf2n6Wg X-Received: by 2002:a05:600c:6814:b0:486:fbe1:2499 with SMTP id 5b1f17b1804b1-48727f7be29mr91414145e9.22.1774692014189; Sat, 28 Mar 2026 03:00:14 -0700 (PDT) Received: from dohko.chello.ie (188-141-5-72.dynamic.upc.ie. [188.141.5.72]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48722d4d884sm198418535e9.15.2026.03.28.03.00.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Mar 2026 03:00:13 -0700 (PDT) From: David Carlier To: laurent.pinchart@ideasonboard.com, mchehab@kernel.org Cc: Frank.Li@nxp.com, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, jacopo@jmondi.org, aisheng.dong@nxp.com, guoniu.zhou@nxp.com, linux-media@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, David Carlier Subject: [PATCH v2] media: nxp: imx8-isi: fix memory leaks in probe error paths and remove Date: Sat, 28 Mar 2026 10:00:10 +0000 Message-ID: <20260328100010.41236-1-devnexen@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260327222711.268132-1-devnexen@gmail.com> References: <20260327222711.268132-1-devnexen@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable mxc_isi_probe() allocates isi->pipes with kzalloc_objs() but never frees it on any probe failure path or in mxc_isi_remove(), leaking the allocation on every failed probe and every normal unbind. Additionally, when mxc_isi_pipe_init() fails partway through the channel loop or when mxc_isi_v4l2_init() fails, the already initialized pipes are not cleaned up =E2=80=94 their media entities and mutexes are lea= ked. Fix both by adding kfree(isi->pipes) to all probe error paths and to mxc_isi_remove(), and cleaning up already-initialized pipes in the err_xbar error path. Fixes: cf21f328fcaf ("media: nxp: Add i.MX8 ISI driver") Signed-off-by: David Carlier --- .../platform/nxp/imx8-isi/imx8-isi-core.c | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c b/drivers/= media/platform/nxp/imx8-isi/imx8-isi-core.c index 4bf8570e1b9e..ab32c5b6ac9c 100644 --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c @@ -490,33 +490,43 @@ static int mxc_isi_probe(struct platform_device *pdev) return -ENOMEM; =20 isi->num_clks =3D devm_clk_bulk_get_all(dev, &isi->clks); - if (isi->num_clks < 0) + if (isi->num_clks < 0) { + kfree(isi->pipes); return dev_err_probe(dev, isi->num_clks, "Failed to get clocks\n"); + } =20 isi->regs =3D devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(isi->regs)) + if (IS_ERR(isi->regs)) { + kfree(isi->pipes); return dev_err_probe(dev, PTR_ERR(isi->regs), "Failed to get ISI register map\n"); + } =20 if (isi->pdata->gasket_ops) { isi->gasket =3D syscon_regmap_lookup_by_phandle(dev->of_node, "fsl,blk-ctrl"); - if (IS_ERR(isi->gasket)) + if (IS_ERR(isi->gasket)) { + kfree(isi->pipes); return dev_err_probe(dev, PTR_ERR(isi->gasket), "failed to get gasket\n"); + } } =20 dma_size =3D isi->pdata->has_36bit_dma ? 36 : 32; dma_set_mask_and_coherent(dev, DMA_BIT_MASK(dma_size)); =20 ret =3D devm_pm_runtime_enable(dev); - if (ret) + if (ret) { + kfree(isi->pipes); return ret; + } =20 ret =3D mxc_isi_crossbar_init(isi); - if (ret) + if (ret) { + kfree(isi->pipes); return dev_err_probe(dev, ret, "Failed to initialize crossbar\n"); + } =20 for (i =3D 0; i < isi->pdata->num_channels; ++i) { ret =3D mxc_isi_pipe_init(isi, i); @@ -538,7 +548,10 @@ static int mxc_isi_probe(struct platform_device *pdev) return 0; =20 err_xbar: + while (i--) + mxc_isi_pipe_cleanup(&isi->pipes[i]); mxc_isi_crossbar_cleanup(&isi->crossbar); + kfree(isi->pipes); =20 return ret; } @@ -556,6 +569,7 @@ static void mxc_isi_remove(struct platform_device *pdev) mxc_isi_pipe_cleanup(pipe); } =20 + kfree(isi->pipes); mxc_isi_crossbar_cleanup(&isi->crossbar); mxc_isi_v4l2_cleanup(isi); } --=20 2.53.0