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 7669E337112; Fri, 17 Oct 2025 15:13:14 +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=1760713994; cv=none; b=qlXUR2BTPYPPMBd3Dwx369GY8Wco7DY3LvwFkG3Kbj2zMnrtgWw9Ys80hj0TDB7I5WmmuUxoIf2yVdylv+TsKTai2P52LY1QSE2cteM2Vr7s8VW+3N2MIEcbmvo/gsQ9GH/mB67jr6YVdtqoAWaHjbjnMhmPGQUU+/udrJm7wcY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760713994; c=relaxed/simple; bh=p6fwrnJNCtoDXnIs8fyURu06t9OyU+I0+XcIRogyJ8c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gYOA4Iy31EPqYaSYKj7QtdDFOsl10aF6ihFn8/avqMFRR0MWLxPQpC0Ne7RvsKWMvu92K5oVKTRDV38ve/feS1WAvWcYMBWVLKkESlRm7435Jvmc/xmDyXjIy+zUnQ+SVpiPHq36W5Rj8cyK/42H30SbaeUv2mnRw7CWihUVRTU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=EPColP1U; 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="EPColP1U" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AEA30C4CEF9; Fri, 17 Oct 2025 15:13:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1760713994; bh=p6fwrnJNCtoDXnIs8fyURu06t9OyU+I0+XcIRogyJ8c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EPColP1UUohQ0X7Ycdn6HPrRBpOYxRgIV6t7zcIyIA/YPc+w2yIvYPwkMCEIHxbMe 4T+XoAK4Khi0LVihnoYlxruAokWf946gDWGoUI999+GSJNyU98SCDeGRB5LT9K6VW1 vsQ8NKwyRbrlEzg9CKzMrCRNx4eZ1iKKwAurJYLI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+031d0cfd7c362817963f@syzkaller.appspotmail.com, Edward Adam Davis , Sakari Ailus , Hans Verkuil , Sasha Levin Subject: [PATCH 6.6 159/201] media: mc: Clear minor number before put device Date: Fri, 17 Oct 2025 16:53:40 +0200 Message-ID: <20251017145140.572833027@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251017145134.710337454@linuxfoundation.org> References: <20251017145134.710337454@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Edward Adam Davis [ Upstream commit 8cfc8cec1b4da88a47c243a11f384baefd092a50 ] The device minor should not be cleared after the device is released. Fixes: 9e14868dc952 ("media: mc: Clear minor number reservation at unregistration time") Cc: stable@vger.kernel.org Reported-by: syzbot+031d0cfd7c362817963f@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=031d0cfd7c362817963f Tested-by: syzbot+031d0cfd7c362817963f@syzkaller.appspotmail.com Signed-off-by: Edward Adam Davis Signed-off-by: Sakari Ailus Signed-off-by: Hans Verkuil [ moved clear_bit from media_devnode_release callback to media_devnode_unregister before put_device ] Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/media/mc/mc-devnode.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) --- a/drivers/media/mc/mc-devnode.c +++ b/drivers/media/mc/mc-devnode.c @@ -50,11 +50,6 @@ static void media_devnode_release(struct { struct media_devnode *devnode = to_media_devnode(cd); - mutex_lock(&media_devnode_lock); - /* Mark device node number as free */ - clear_bit(devnode->minor, media_devnode_nums); - mutex_unlock(&media_devnode_lock); - /* Release media_devnode and perform other cleanups as needed. */ if (devnode->release) devnode->release(devnode); @@ -283,6 +278,7 @@ void media_devnode_unregister(struct med /* Delete the cdev on this minor as well */ cdev_device_del(&devnode->cdev, &devnode->dev); devnode->media_dev = NULL; + clear_bit(devnode->minor, media_devnode_nums); mutex_unlock(&media_devnode_lock); put_device(&devnode->dev);