From nobody Fri Dec 19 07:02:12 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 45D0920DD3A; Sun, 24 Mar 2024 23:07:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321655; cv=none; b=BkeenQw/XDxon5/dDxdTjwJ0Gj0Wyc5im0WVL9UAeJs7v7HqAKN8otGHtNuJZ/FkQ1X7dga5yY3UCGMhTXezqKdmk5qL8jeIasOhlgT8rfqKshVoOKy9AZWb0MhPpp4BUrXIL+YEfAjEtI7m/lc+INVIdYIlNDve4Hm2TzkPLyo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321655; c=relaxed/simple; bh=8POOEHMBodqPxKTRL+FZX71hTSWmfb8XiVKdy1zhITA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZFcR/qtt7F83wA57pLqGk3GgT5lpVnBJOfVO6IctEJhmx9SVV/TslpWBMjz2fr7A2qXd3omOx8CFlZs+SoZoy8va+w9cANxeqVuYrGRqgYLDyUBZSO06BLQnKMDt5pvYtCzIMaYM1f8EPqyO57mLZVYZJcp8lU9a2H+4pfEfYHs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=JeGBBgpv; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="JeGBBgpv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 764BEC433C7; Sun, 24 Mar 2024 23:07:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711321654; bh=8POOEHMBodqPxKTRL+FZX71hTSWmfb8XiVKdy1zhITA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JeGBBgpv6LveagcIp3eC0HbX3AaBh4Pnx+EYh32jl56F9BCudOgtpvy08CYZqZ5GK Db7mhWR53EbUeIHhCohnW5zqag8Ka/2eOjG0mQ3zZq9R0Z82ZimVcg4OhhgR3DitT+ w56Al5+f1neFRiwzpwCrudcgv3GIG3nvrMtcGeDUo5XRNqsUjpW2gkSOvF6Eiqu3q/ sfGftGmUKggsypOMuitKIxKW+En7lfZbeEPjYtFC2wYfHDg11XIAKsxCAhPgDuU/Xz DXjAyrVETy2u0et2PdPOGXXVvw8lEk0MIlimMhRqbK9kmxdZyRo9uUmVD6RWoEPuNd EubvVC64JJM2Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zhipeng Lu , Hans Verkuil , Sasha Levin Subject: [PATCH 6.6 383/638] media: v4l2-mem2mem: fix a memleak in v4l2_m2m_register_entity Date: Sun, 24 Mar 2024 18:57:00 -0400 Message-ID: <20240324230116.1348576-384-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324230116.1348576-1-sashal@kernel.org> References: <20240324230116.1348576-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Zhipeng Lu [ Upstream commit 8f94b49a5b5d386c038e355bef6347298aabd211 ] The entity->name (i.e. name) is allocated in v4l2_m2m_register_entity but isn't freed in its following error-handling paths. This patch adds such deallocation to prevent memleak of entity->name. Fixes: be2fff656322 ("media: add helpers for memory-to-memory media control= ler") Signed-off-by: Zhipeng Lu Signed-off-by: Hans Verkuil Signed-off-by: Sasha Levin --- drivers/media/v4l2-core/v4l2-mem2mem.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-co= re/v4l2-mem2mem.c index 0cc30397fbad5..8db9ac9c1433f 100644 --- a/drivers/media/v4l2-core/v4l2-mem2mem.c +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c @@ -1084,11 +1084,17 @@ static int v4l2_m2m_register_entity(struct media_de= vice *mdev, entity->function =3D function; =20 ret =3D media_entity_pads_init(entity, num_pads, pads); - if (ret) + if (ret) { + kfree(entity->name); + entity->name =3D NULL; return ret; + } ret =3D media_device_register_entity(mdev, entity); - if (ret) + if (ret) { + kfree(entity->name); + entity->name =3D NULL; return ret; + } =20 return 0; } --=20 2.43.0