]> git.baikalelectronics.ru Git - kernel.git/commitdiff
rapidio: fix possible UAF when kfifo_alloc() fails
authorWang Weiyang <wangweiyang2@huawei.com>
Wed, 23 Nov 2022 09:51:47 +0000 (17:51 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Jan 2023 10:40:58 +0000 (11:40 +0100)
[ 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: d77b359ee139 ("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>
drivers/rapidio/devices/rio_mport_cdev.c

index 51440668ee79cb73cb6293c1bcd179635eac6b0e..8a420dfd5ee15843c28e616e4b09a300941114a7 100644 (file)
@@ -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;