From nobody Sat Dec 28 05:56:21 2024 Received: from mail.nfschina.com (unknown [42.101.60.213]) by smtp.subspace.kernel.org (Postfix) with SMTP id D331B2595; Tue, 17 Dec 2024 01:54:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=42.101.60.213 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734400467; cv=none; b=N/1C1RjH3YLHmJhSvRYk1hXSlV78Nn3Wa+PgXCycMBp8vZlxZcKE5gTfLFHuksccGmM7HP/uL26o1yle/0EPeX75nD4O0Fg3AzA0RIScMzK3TrP9Abrscr67NbG/VSTfwNEjaRbyRLIXQa0KbXA1k2C+OF1/ZPcSZ1DRtRMCkGI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734400467; c=relaxed/simple; bh=AKnwrjfurYTExrdozB+/U9GlNZVTFyPpKBCJhqXDLbo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:MIME-Version; b=TnMd6nijTmMq0YUIV/ju/tZsw1/rgJUJGDMv6HF/uhyYSqpM08p9rJTJXhRrcqhunrKt+J5ZwYthUcj/lu0P1aCl+ZrpJsoS1bMcGi7Vzfu286ILCCBcUhptmsqKRKSYIUwz0OMUd/oZt6+/7VutpEP5msR88a2k8bYfnhkOUIY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=nfschina.com; spf=pass smtp.mailfrom=nfschina.com; arc=none smtp.client-ip=42.101.60.213 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=nfschina.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nfschina.com Received: from localhost.localdomain (unknown [103.163.180.3]) by mail.nfschina.com (MailData Gateway V2.8.8) with ESMTPSA id 566BE6017097D; Tue, 17 Dec 2024 09:54:09 +0800 (CST) X-MD-Sfrom: zhanxin@nfschina.com X-MD-SrcIP: 103.163.180.3 From: Zhanxin Qi To: kherbst@redhat.com, lyude@redhat.com, dakr@redhat.com, airlied@gmail.com, simona@ffwll.ch Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Zhanxin Qi , Duanjun Li Subject: [PATCH v2] drm/nouveau: Fix memory leak in nvbios_iccsense_parse Date: Tue, 17 Dec 2024 09:53:02 +0800 Message-Id: <20241217015302.281769-1-zhanxin@nfschina.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The nvbios_iccsense_parse function allocates memory for sensor data but fails to free it when the function exits, leading to a memory leak. Add proper cleanup to free the allocated memory. Fixes: b71c0892631a ("drm/nouveau/iccsense: implement for ina209, ina219 an= d ina3221") Cc: stable@vger.kernel.org Co-developed-by: Duanjun Li Signed-off-by: Zhanxin Qi --- .../include/nvkm/subdev/bios/iccsense.h | 2 ++ .../drm/nouveau/nvkm/subdev/bios/iccsense.c | 20 +++++++++++++++++++ .../drm/nouveau/nvkm/subdev/iccsense/base.c | 3 +++ 3 files changed, 25 insertions(+) diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/iccsense.h b/= drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/iccsense.h index 4c108fd2c805..8bfc28c3f7a7 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/iccsense.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/iccsense.h @@ -20,4 +20,6 @@ struct nvbios_iccsense { }; =20 int nvbios_iccsense_parse(struct nvkm_bios *, struct nvbios_iccsense *); + +void nvbios_iccsense_cleanup(struct nvbios_iccsense *iccsense); #endif diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/iccsense.c b/drivers/= gpu/drm/nouveau/nvkm/subdev/bios/iccsense.c index dea444d48f94..ca7c27b92f16 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/iccsense.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/iccsense.c @@ -56,6 +56,19 @@ nvbios_iccsense_table(struct nvkm_bios *bios, u8 *ver, u= 8 *hdr, u8 *cnt, return 0; } =20 +/** + * nvbios_iccsense_parse - Parse ICCSENSE table from VBIOS + * @bios: VBIOS base pointer + * @iccsense: ICCSENSE table structure to fill + * + * Parses the ICCSENSE table from VBIOS and fills the provided structure. + * The caller must invoke nvbios_iccsense_cleanup() after successful parsi= ng + * to free the allocated rail resources. + * + * Returns: + * 0 - Success + * -EINVAL - Table not found + */ int nvbios_iccsense_parse(struct nvkm_bios *bios, struct nvbios_iccsense *iccs= ense) { @@ -127,3 +140,10 @@ nvbios_iccsense_parse(struct nvkm_bios *bios, struct n= vbios_iccsense *iccsense) =20 return 0; } + +void +nvbios_iccsense_cleanup(struct nvbios_iccsense *iccsense) +{ + kfree(iccsense->rail); + iccsense->rail =3D NULL; +} diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c b/drivers/= gpu/drm/nouveau/nvkm/subdev/iccsense/base.c index 8f0ccd3664eb..4c1759ecce38 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c @@ -291,6 +291,9 @@ nvkm_iccsense_oneinit(struct nvkm_subdev *subdev) list_add_tail(&rail->head, &iccsense->rails); } } + + nvbios_iccsense_cleanup(&stbl); + return 0; } =20 --=20 2.30.2