Commit aa609da5 authored by Zhangfei Gao's avatar Zhangfei Gao Committed by JiangShui
Browse files

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

mainline inclusion
from mainline-v6.5-rc1
commit df1b056d
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I87RJC
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=df1b056d489d98c7c45fa89627102dd34b44496f



----------------------------------------------------------------------

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: default avatarWeili Qian <qianweili@huawei.com>
Signed-off-by: default avatarZhangfei Gao <zhangfei.gao@linaro.org>
Link: https://lore.kernel.org/r/20230511095921.9331-2-zhangfei.gao@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJiangShui Yang <yangjiangshui@h-partners.com>
parent df86cdc5

drivers/misc/uacce/uacce.c

+7 −7
Original line number Diff line number Diff line
@@ -349,8 +349,8 @@ static int uacce_fops_open(struct inode *inode, struct file *filep) 


	init_waitqueue_head(&q->wait);

	filep->private_data = q;

	uacce->inode = inode;

	q->state = UACCE_Q_INIT;

	q->mapping = filep->f_mapping;

	mutex_init(&q->mutex);

	list_add(&q->list, &uacce->queues);

	mutex_unlock(&uacce->mutex);
@@ -1038,12 +1038,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
@@ -1061,6 +1055,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(q->mapping, 0, 0, 1);

	}



	/* disable sva now since no opened queues */

include/linux/uacce.h

+2 −2
Original line number Diff line number Diff line
@@ -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()

 * @mapping: user space mapping of the queue

 */

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;

	struct address_space *mapping;

};



/**
@@ -146,7 +148,6 @@ struct uacce_queue { 
 * @mutex: protects uacce operation

 * @priv: private pointer of the uacce

 * @queues: list of queues

 * @inode: core vfs

 */

struct uacce_device {

	const char *algs;
@@ -164,7 +165,6 @@ struct uacce_device { 
	void *priv;

	struct uacce_err_isolate *isolate;

	struct list_head queues;

	struct inode *inode;

};



#if IS_ENABLED(CONFIG_UACCE)