ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

uacce: use q->mapping to replace inode->i_mapping

Browse Source 
The inode can be different in a container, for example, a docker and host
both open the same uacce parent device, which uses the same uacce struct
but different inode, so uacce->inode is not enough.

What's worse, when docker stops, the inode will be destroyed as well,
causing use-after-free in uacce_remove.

So use q->mapping to replace uacce->inode->i_mapping.

Signed-off-by: Weili Qian <qianweili@huawei.com>
Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
Link: https://lore.kernel.org/r/20230511095921.9331-2-zhangfei.gao@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Zhangfei Gao
2023-05-11 17:59:20 +08:00
committed by Greg Kroah-Hartman
parent 24ee010bda
commit df1b056d48
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/misc/uacce/uacce.c
View File

@@ -166,8 +166,8 @@ static int uacce_fops_open(struct inode *inode, struct file *filep)
init_waitqueue_head(&q->wait); init_waitqueue_head(&q->wait);
filep->private_data = q; filep->private_data = q;
uacce->inode = inode;
q->state = UACCE_Q_INIT; q->state = UACCE_Q_INIT;
q->mapping = filep->f_mapping;
mutex_init(&q->mutex); mutex_init(&q->mutex);
list_add(&q->list, &uacce->queues); list_add(&q->list, &uacce->queues);
mutex_unlock(&uacce->mutex); mutex_unlock(&uacce->mutex);
@@ -574,12 +574,6 @@ void uacce_remove(struct uacce_device *uacce)
if (!uacce) if (!uacce)
return; return;
/*
* unmap remaining mapping from user space, preventing user still
* access the mmaped area while parent device is already removed
*/
if (uacce->inode)
unmap_mapping_range(uacce->inode->i_mapping, 0, 0, 1);
/* /*
* uacce_fops_open() may be running concurrently, even after we remove * uacce_fops_open() may be running concurrently, even after we remove
@@ -597,6 +591,12 @@ void uacce_remove(struct uacce_device *uacce)
uacce_put_queue(q); uacce_put_queue(q);
mutex_unlock(&q->mutex); mutex_unlock(&q->mutex);
uacce_unbind_queue(q); uacce_unbind_queue(q);
/*
* unmap remaining mapping from user space, preventing user still
* access the mmaped area while parent device is already removed
*/
unmap_mapping_range(q->mapping, 0, 0, 1);
} }
/* disable sva now since no opened queues */ /* disable sva now since no opened queues */

4
include/linux/uacce.h
View File

@@ -86,6 +86,7 @@ enum uacce_q_state {
* @state: queue state machine * @state: queue state machine
* @pasid: pasid associated to the mm * @pasid: pasid associated to the mm
* @handle: iommu_sva handle returned by iommu_sva_bind_device() * @handle: iommu_sva handle returned by iommu_sva_bind_device()
* @mapping: user space mapping of the queue
*/ */
struct uacce_queue { struct uacce_queue {
struct uacce_device *uacce; struct uacce_device *uacce;
@@ -97,6 +98,7 @@ struct uacce_queue {
enum uacce_q_state state; enum uacce_q_state state;
u32 pasid; u32 pasid;
struct iommu_sva *handle; struct iommu_sva *handle;
struct address_space *mapping;
}; };
/** /**
@@ -114,7 +116,6 @@ struct uacce_queue {
* @mutex: protects uacce operation * @mutex: protects uacce operation
* @priv: private pointer of the uacce * @priv: private pointer of the uacce
* @queues: list of queues * @queues: list of queues
* @inode: core vfs
*/ */
struct uacce_device { struct uacce_device {
const char *algs; const char *algs;
@@ -130,7 +131,6 @@ struct uacce_device {
struct mutex mutex; struct mutex mutex;
void *priv; void *priv;
struct list_head queues; struct list_head queues;
struct inode *inode;
}; };
#if IS_ENABLED(CONFIG_UACCE) #if IS_ENABLED(CONFIG_UACCE)