Skip to content

Commit 2f5cc7f

Browse files
Wang Weiyanggregkh
authored andcommitted
rapidio: fix possible UAF when kfifo_alloc() fails
[ Upstream commit 02d7d89 ] 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: e8de370 ("rapidio: add mport char device driver") Signed-off-by: Wang 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: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 337b68d commit 2f5cc7f

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

drivers/rapidio/devices/rio_mport_cdev.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1903,10 +1903,6 @@ static int mport_cdev_open(struct inode *inode, struct file *filp)
19031903

19041904
priv->md = chdev;
19051905

1906-
mutex_lock(&chdev->file_mutex);
1907-
list_add_tail(&priv->list, &chdev->file_list);
1908-
mutex_unlock(&chdev->file_mutex);
1909-
19101906
INIT_LIST_HEAD(&priv->db_filters);
19111907
INIT_LIST_HEAD(&priv->pw_filters);
19121908
spin_lock_init(&priv->fifo_lock);
@@ -1925,6 +1921,9 @@ static int mport_cdev_open(struct inode *inode, struct file *filp)
19251921
spin_lock_init(&priv->req_lock);
19261922
mutex_init(&priv->dma_lock);
19271923
#endif
1924+
mutex_lock(&chdev->file_mutex);
1925+
list_add_tail(&priv->list, &chdev->file_list);
1926+
mutex_unlock(&chdev->file_mutex);
19281927

19291928
filp->private_data = priv;
19301929
goto out;

0 commit comments

Comments
 (0)