From mboxrd@z Thu Jan 1 00:00:00 1970 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 11E5E64CF1; Tue, 23 Jan 2024 00:59:04 +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=1705971544; cv=none; b=mFTzN6O0r59gvkwD6KQNrHm6dN1BM5XiQE+KVqYlUDYcb1OVWjR1WpiIQbBnCqHB2Ern+CYpqsIShcUu1c6kn+/MVlbGMuUvWj3JVDWPHKMaMesWGP578cZhCtdnY4TlCFq32Z0KENj8atQYeHnssvM3UdrEhtGkCkBPi03ICa0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705971544; c=relaxed/simple; bh=MJQX4VeSDMtVYaVY+BbdvSD+7i+YVVQLYIHu4AgP89Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jUXzdJmWpqvpn1Cfu/IYA6UyfC9z8ieoOuGW1EUxd0L9LZuHPplECU5vjhrZnIH6qHdvIfsIIb+ScxZ4GqVFQ2BEK2n7Bh0UyphWbK7h4Y3GdCOQgkXEdLosEO7ZhORcbNuQOQcFYncZ/X5KYPYTc986l40GQX7M0qTX7YoCdLk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=GtVRxwX6; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="GtVRxwX6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B8F1CC433C7; Tue, 23 Jan 2024 00:59:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705971543; bh=MJQX4VeSDMtVYaVY+BbdvSD+7i+YVVQLYIHu4AgP89Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GtVRxwX6YvqfPyhvTD6cWsgQvuwlnU9kapoCotDGB12LlgujE/IYzU1WRRbGgtIdQ 1s5yp5NN8btjXOzZW50rx2GGp/ejEQ6M52FFKLmldHTnxTvI8HbXfzvIUWk0dXEBo0 8T+mroPOLblbpO0pFaMrw2N6R1UdC0spGD5jTV7M= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christophe JAILLET , Hans Verkuil , Sasha Levin Subject: [PATCH 5.10 170/286] media: dvb-frontends: m88ds3103: Fix a memory leak in an error handling path of m88ds3103_probe() Date: Mon, 22 Jan 2024 15:57:56 -0800 Message-ID: <20240122235738.722336830@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235732.009174833@linuxfoundation.org> References: <20240122235732.009174833@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Christophe JAILLET [ Upstream commit 5b2f885e2f6f482d05c23f04c8240f7b4fc5bdb5 ] If an error occurs after a successful i2c_mux_add_adapter(), then i2c_mux_del_adapters() should be called to free some resources, as already done in the remove function. Fixes: e6089feca460 ("media: m88ds3103: Add support for ds3103b demod") Signed-off-by: Christophe JAILLET Signed-off-by: Hans Verkuil Signed-off-by: Sasha Levin --- drivers/media/dvb-frontends/m88ds3103.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/media/dvb-frontends/m88ds3103.c b/drivers/media/dvb-frontends/m88ds3103.c index ff106d6ece68..94c6cc59372c 100644 --- a/drivers/media/dvb-frontends/m88ds3103.c +++ b/drivers/media/dvb-frontends/m88ds3103.c @@ -1898,7 +1898,7 @@ static int m88ds3103_probe(struct i2c_client *client, /* get frontend address */ ret = regmap_read(dev->regmap, 0x29, &utmp); if (ret) - goto err_kfree; + goto err_del_adapters; dev->dt_addr = ((utmp & 0x80) == 0) ? 0x42 >> 1 : 0x40 >> 1; dev_dbg(&client->dev, "dt addr is 0x%02x\n", dev->dt_addr); @@ -1906,11 +1906,14 @@ static int m88ds3103_probe(struct i2c_client *client, dev->dt_addr); if (IS_ERR(dev->dt_client)) { ret = PTR_ERR(dev->dt_client); - goto err_kfree; + goto err_del_adapters; } } return 0; + +err_del_adapters: + i2c_mux_del_adapters(dev->muxc); err_kfree: kfree(dev); err: -- 2.43.0