From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795052433; b=apJiYjZOMvE/kd16e18KsAjXwyJTaR0assQdX6BuxmExIXPccvCLXesulM3e8KduuQN4 +scq1hBZFz3NSMZXUuAIu0+v+7C+/ZyRkwwHhguThFw84/Db/3K2UDXUFFdTTuV7dM+va hWxYgv32H1RFnqUOw8lKcKULlLpzY7JRsSvG0CATIHjooQggdyKQLUljWwKLguwvwlurg KDL1piUhbZxUe/KDpa/xgq3Dgebei3nuUoMxFGZrEp00X28gX7P1DuqV3eyPFbbBbVhwA sfxEZTg2LCzSaVD+OOU2l8KSObitLPoFjPdALa2NSZiQh38jFw775O/5dETS93pQlOQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795052433; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=yFYoAGRZGSs7Lp+Mno/SjSFKTqKvkw5dMOzdCBLMM/w=; b=JT55Xmxqm2eNkNhSFjCGqyMPzDgyNtiJJhwKF/uTHcWTjf5EZqyqRqveBZEe/4bDJhH0 oeHBz+m7lyOOm+PTGzxVpB6UhQyOU0bmQTzlv2k2ma2On7HgrgEjyPnOqrcaQxZL14rL4 pdbmK0+BADWMD+t5skRuwzw/dS8uyl94dGwumpuZfaIkTkOSWxz06/4BNNzttSMdhgNBf /Ck+EGiUO8cOpYIXK+E+xJKPLOtATmNqMhvR/tjNuTK+8NrcyqM3ToRQmJKAdGSmSjBpH AKP7vrefoALZLT3mUYYCBd9KrVgAnRWg0rfVIoHwfYS99Mb13GODwbYDARioUcu1cnw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=mONbwsgM; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5C6AC606A31C; Thu, 19 Nov 2026 01:40:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=mONbwsgM Received: by smtp.kernel.org (Postfix) with ESMTPSA id B78381F000C4; Thu, 19 Nov 2026 01:40:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795052433; bh=yFYoAGRZGSs7Lp+Mno/SjSFKTqKvkw5dMOzdCBLMM/w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=mONbwsgM/s9D5QbIXgLs8YTnJpf09zthLUvhZv8GBugdPxoXvCfZLXw+LW5JYGQtW 7TI1OTWs+OldeHchvHe5xcprFk7RbfDoR2KB+7ojQYgXe6AdZ3TC0lgaYnheUSZDVS jVBl3mwVyWMd106TWcg/aNQJAkPzPA9fcjERThzs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ijae Kim , Myeonghun Pak , Hans Verkuil , Sasha Levin Subject: [PATCH 5.15 0525/2214] media: cx18: Disable PCI device on probe failure Date: Wed, 18 Nov 2026 15:36:41 +0100 Message-ID: <20261118150032.083486421@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Myeonghun Pak [ Upstream commit 2aefbc29765641e1e1a26b96cee194ac7d34ff49 ] cx18_setup_pci() enables the PCI device but does not disable it when DMA mask setup or the memory-region reservation fails. Later probe failure paths release the region without balancing the enable either. Unwind the enable inside cx18_setup_pci() when that helper fails after enabling the device. Once setup succeeds, disable it in the probe cleanup after releasing the memory region. Setup failures skip that cleanup, so each successful enable is balanced exactly once. Keep the existing error codes and normal removal path unchanged. This issue was identified during our ongoing static-analysis research while reviewing kernel code. Fixes: 1c1e45d17b66 ("V4L/DVB (7786): cx18: new driver for the Conexant CX23418 MPEG encoder chip") Cc: stable@vger.kernel.org Co-developed-by: Ijae Kim Signed-off-by: Ijae Kim Signed-off-by: Myeonghun Pak Assisted-by: OpenAI:GPT-5.6 Signed-off-by: Hans Verkuil Signed-off-by: Sasha Levin --- drivers/media/pci/cx18/cx18-driver.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/media/pci/cx18/cx18-driver.c b/drivers/media/pci/cx18/cx18-driver.c index 59497ba6bf1f1..ec2e19fdf1399 100644 --- a/drivers/media/pci/cx18/cx18-driver.c +++ b/drivers/media/pci/cx18/cx18-driver.c @@ -806,12 +806,12 @@ static int cx18_setup_pci(struct cx18 *cx, struct pci_dev *pci_dev, } if (dma_set_mask(&pci_dev->dev, DMA_BIT_MASK(32))) { CX18_ERR("No suitable DMA available, card %d\n", cx->instance); - return -EIO; + goto err_disable_device; } if (!request_mem_region(cx->base_addr, CX18_MEM_SIZE, "cx18 encoder")) { CX18_ERR("Cannot request encoder memory region, card %d\n", cx->instance); - return -EIO; + goto err_disable_device; } /* Enable bus mastering and memory mapped IO for the CX23418 */ @@ -835,6 +835,10 @@ static int cx18_setup_pci(struct cx18 *cx, struct pci_dev *pci_dev, cx->pci_dev->irq, pci_latency, (u64)cx->base_addr); return 0; + +err_disable_device: + pci_disable_device(pci_dev); + return -EIO; } static void cx18_init_subdevs(struct cx18 *cx) @@ -1121,6 +1125,7 @@ static int cx18_probe(struct pci_dev *pci_dev, cx18_iounmap(cx); free_mem: release_mem_region(cx->base_addr, CX18_MEM_SIZE); + pci_disable_device(pci_dev); free_workqueues: destroy_workqueue(cx->in_work_queue); err: -- 2.53.0