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 DB5B62459C6 for ; Fri, 3 Oct 2025 20:43:29 +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=1759524209; cv=none; b=bmKKPAQgB5jhZbLvUIATtDQ5ZYfhWHoEnN9GsBpUj+V/j4Ogo8RbOcIqKbWMgJOnb/6JNPfKOUEUr7O/o7uaRkjNavXQ5h8sPP7DsHgLc7HGgq/Shn+HKuLX13wdbM4l/EKR1AO3Td8fDdzUFAhGuMeRpTcIHlqGBqZMqNycKoM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759524209; c=relaxed/simple; bh=AUBIFMN0oL9q60EaetitQwhQca5lqAfJFQq3y+UmHXU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DKwuBklBEevjI5Qnie7mkaKCAZvlZ7K4256702USS5i2o2ZEOJApyE4X2wfW+A86cwx+QwpJvznFGNFy/0NkLb/JmatKxEnXepYRSqkY2rWYPMDsT6Q30TVlBacI4yeS35b3qIumLm08Jn/iStSx6nhzYGI7PRA6LOlsrpA3Cc8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tO8ix+vo; 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="tO8ix+vo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1AA88C4CEF5; Fri, 3 Oct 2025 20:43:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1759524209; bh=AUBIFMN0oL9q60EaetitQwhQca5lqAfJFQq3y+UmHXU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tO8ix+vo/ORnN2uQNY/S8ZFgEqUFZCVBlro6PspbUOdRHHIPAE7n/Eel6ln8njBNN BamwiLmlBRhkJVpgYtn1BN0d6+ReB1bZzv+QYiC5GH2dRjkilDw2YKI2egsgLO42ZV BjR1UVIvOJA8EONFrqK4GXrbFlNO4erkgbgPoFf4zhupuD3f/K3tuQ6JvUqjIYmX99 pjEFBY0wtbwBlcJBa/96GZ9Q35RpeAqcXgUc+6kPZZ3fF4w0J2bUK3kYTBbn0AHTOY Jrk2jrneyRgBB5GY4MNcsozMHZi9wpFzkoXzxa6vfWOI+g8UjJ9ck8P7MKQ8JTdEDF BthjCmB9tbwdg== From: Sasha Levin To: stable@vger.kernel.org Cc: Ricardo Ribalda , Shuah Khan , Hans Verkuil , Sasha Levin Subject: [PATCH 6.1.y 1/2] media: tunner: xc5000: Refactor firmware load Date: Fri, 3 Oct 2025 16:43:25 -0400 Message-ID: <20251003204327.3377848-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2025100339-scarring-buffoon-fbc5@gregkh> References: <2025100339-scarring-buffoon-fbc5@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Ricardo Ribalda [ Upstream commit 8e1f5da59dd4a1966f859639860b803a7e8b8bfb ] Make sure the firmware is released when we leave xc_load_fw_and_init_tuner() This change makes smatch happy: drivers/media/tuners/xc5000.c:1213 xc_load_fw_and_init_tuner() warn: 'fw' from request_firmware() not released on lines: 1213. Cc: Shuah Khan Signed-off-by: Ricardo Ribalda Signed-off-by: Hans Verkuil Stable-dep-of: 40b7a19f321e ("media: tuner: xc5000: Fix use-after-free in xc5000_release") Signed-off-by: Sasha Levin --- drivers/media/tuners/xc5000.c | 39 +++++++++++++++-------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/drivers/media/tuners/xc5000.c b/drivers/media/tuners/xc5000.c index 2182e5b7b6064..30aa4ee958bde 100644 --- a/drivers/media/tuners/xc5000.c +++ b/drivers/media/tuners/xc5000.c @@ -58,7 +58,7 @@ struct xc5000_priv { struct dvb_frontend *fe; struct delayed_work timer_sleep; - const struct firmware *firmware; + bool inited; }; /* Misc Defines */ @@ -1110,23 +1110,19 @@ static int xc_load_fw_and_init_tuner(struct dvb_frontend *fe, int force) if (!force && xc5000_is_firmware_loaded(fe) == 0) return 0; - if (!priv->firmware) { - ret = request_firmware(&fw, desired_fw->name, - priv->i2c_props.adap->dev.parent); - if (ret) { - pr_err("xc5000: Upload failed. rc %d\n", ret); - return ret; - } - dprintk(1, "firmware read %zu bytes.\n", fw->size); + ret = request_firmware(&fw, desired_fw->name, + priv->i2c_props.adap->dev.parent); + if (ret) { + pr_err("xc5000: Upload failed. rc %d\n", ret); + return ret; + } + dprintk(1, "firmware read %zu bytes.\n", fw->size); - if (fw->size != desired_fw->size) { - pr_err("xc5000: Firmware file with incorrect size\n"); - release_firmware(fw); - return -EINVAL; - } - priv->firmware = fw; - } else - fw = priv->firmware; + if (fw->size != desired_fw->size) { + pr_err("xc5000: Firmware file with incorrect size\n"); + release_firmware(fw); + return -EINVAL; + } /* Try up to 5 times to load firmware */ for (i = 0; i < 5; i++) { @@ -1204,6 +1200,7 @@ static int xc_load_fw_and_init_tuner(struct dvb_frontend *fe, int force) } err: + release_firmware(fw); if (!ret) printk(KERN_INFO "xc5000: Firmware %s loaded and running.\n", desired_fw->name); @@ -1274,7 +1271,7 @@ static int xc5000_resume(struct dvb_frontend *fe) /* suspended before firmware is loaded. Avoid firmware load in resume path. */ - if (!priv->firmware) + if (!priv->inited) return 0; return xc5000_set_params(fe); @@ -1293,6 +1290,8 @@ static int xc5000_init(struct dvb_frontend *fe) if (debug) xc_debug_dump(priv); + priv->inited = true; + return 0; } @@ -1306,10 +1305,6 @@ static void xc5000_release(struct dvb_frontend *fe) if (priv) { cancel_delayed_work(&priv->timer_sleep); - if (priv->firmware) { - release_firmware(priv->firmware); - priv->firmware = NULL; - } hybrid_tuner_release_state(priv); } -- 2.51.0