From: Zhangfei Gao zhangfei.gao@linaro.org
driver inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I79JRM CVE: NA
----------------------------------------------------------------------
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 stopped, the inode will be destroyed as well, causing use-after-free in uacce_remove.
So use q->filep->f_mapping to replace uacce->inode->i_mapping.
Signed-off-by: Zhangfei Gao zhangfei.gao@linaro.org Signed-off-by: JiangShui Yang yangjiangshui@h-partners.com --- drivers/misc/uacce/uacce.c | 16 +++++++++------- include/linux/uacce.h | 4 ++-- 2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/drivers/misc/uacce/uacce.c b/drivers/misc/uacce/uacce.c index c7106b69f198..6d2961676a54 100644 --- a/drivers/misc/uacce/uacce.c +++ b/drivers/misc/uacce/uacce.c @@ -355,8 +355,8 @@ static int uacce_fops_open(struct inode *inode, struct file *filep) atomic_inc(&uacce->ref); init_waitqueue_head(&q->wait); filep->private_data = q; - uacce->inode = inode; q->state = UACCE_Q_INIT; + q->private_data = filep; mutex_init(&q->mutex); list_add(&q->list, &uacce->queues); mutex_unlock(&uacce->mutex); @@ -1054,12 +1054,6 @@ void uacce_remove(struct uacce_device *uacce)
if (!uacce) 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 @@ -1069,6 +1063,8 @@ void uacce_remove(struct uacce_device *uacce) mutex_lock(&uacce->mutex); /* ensure no open queue remains */ list_for_each_entry_safe(q, next_q, &uacce->queues, list) { + struct file *filep = q->private_data; + /* * Taking q->mutex ensures that fops do not use the defunct * uacce->ops after the queue is disabled. @@ -1077,6 +1073,12 @@ void uacce_remove(struct uacce_device *uacce) uacce_put_queue(q); mutex_unlock(&q->mutex); 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(filep->f_mapping, 0, 0, 1); }
/* disable sva now since no opened queues */ diff --git a/include/linux/uacce.h b/include/linux/uacce.h index c4161b0632fe..8187c1bda236 100644 --- a/include/linux/uacce.h +++ b/include/linux/uacce.h @@ -115,6 +115,7 @@ enum uacce_q_state { * @state: queue state machine * @pasid: pasid associated to the mm * @handle: iommu_sva handle returned by iommu_sva_bind_device() + * @private_data: private data for saving filep */ struct uacce_queue { struct uacce_device *uacce; @@ -129,6 +130,7 @@ struct uacce_queue { enum uacce_q_state state; u32 pasid; struct iommu_sva *handle; + void *private_data; };
/** @@ -147,7 +149,6 @@ struct uacce_queue { * @priv: private pointer of the uacce * @queues: list of queues * @ref: reference of the uacce - * @inode: core vfs */ struct uacce_device { const char *algs; @@ -166,7 +167,6 @@ struct uacce_device { atomic_t ref; struct uacce_err_isolate *isolate; struct list_head queues; - struct inode *inode; };
#if IS_ENABLED(CONFIG_UACCE)