Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 311b4884 authored by Wang Weiyang's avatar Wang Weiyang Committed by Greg Kroah-Hartman
Browse files

rapidio: fix possible UAF when kfifo_alloc() fails 

[ Upstream commit 02d7d89f816951e0862147d751b1150d67aaebdd ]

If kfifo_alloc() fails in mport_cdev_open(), goto err_fifo and just free
priv. But priv is still in the chdev->file_list, then list traversal
may cause UAF. This fixes the following smatch warning:

drivers/rapidio/devices/rio_mport_cdev.c:1930 mport_cdev_open() warn: '&priv->list' not removed from list

Link: https://lkml.kernel.org/r/20221123095147.52408-1-wangweiyang2@huawei.com


Fixes: e8de3701 ("rapidio: add mport char device driver")
Signed-off-by: default avatarWang Weiyang <wangweiyang2@huawei.com>
Cc: Alexandre Bounine <alex.bou9@gmail.com>
Cc: Dan Carpenter <error27@gmail.com>
Cc: Jakob Koschel <jakobkoschel@gmail.com>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Yang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 7aa5325e

drivers/rapidio/devices/rio_mport_cdev.c

+3 −4
Original line number Diff line number Diff line
@@ -1907,10 +1907,6 @@ static int mport_cdev_open(struct inode *inode, struct file *filp) 


	priv->md = chdev;



	mutex_lock(&chdev->file_mutex);

	list_add_tail(&priv->list, &chdev->file_list);

	mutex_unlock(&chdev->file_mutex);



	INIT_LIST_HEAD(&priv->db_filters);

	INIT_LIST_HEAD(&priv->pw_filters);

	spin_lock_init(&priv->fifo_lock);
@@ -1929,6 +1925,9 @@ static int mport_cdev_open(struct inode *inode, struct file *filp) 
	spin_lock_init(&priv->req_lock);

	mutex_init(&priv->dma_lock);

#endif

	mutex_lock(&chdev->file_mutex);

	list_add_tail(&priv->list, &chdev->file_list);

	mutex_unlock(&chdev->file_mutex);



	filp->private_data = priv;

	goto out;