Skip to contentSkip to conversation

rapidio-fix-possible-uaf-when-kfifo_alloc-fails.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message Dec 12, 2022

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: rapidio: fix possible UAF when kfifo_alloc() fails
has been removed from the -mm tree. Its filename was
rapidio-fix-possible-uaf-when-kfifo_alloc-fails.patch

This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Wang Weiyang <[email protected]>
Subject: rapidio: fix possible UAF when kfifo_alloc() fails
Date: Wed, 23 Nov 2022 17:51:47 +0800

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

Fixes e8de370188d0 ("rapidio: add mport char device driver")
Cc Alexandre Bounine <[email protected]>
Cc Dan Carpenter <[email protected]>
Cc Jakob Koschel <[email protected]>
Cc John Hubbard <[email protected]>
Cc Matt Porter <[email protected]>
Cc Yang Yingliang <[email protected]>

---

 drivers/rapidio/devices/rio_mport_cdev.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/rapidio/devices/rio_mport_cdev.c renamed from drivers/rapidio/devices/rio_mport_cdev.c~rapidio-fix-possible-uaf-when-kfifo_alloc-fails +3 -4
@@ -1904,10 +1904,6 @@ static int mport_cdev_open(struct inode
 
 	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);
@@ -1926,6 +1922,9 @@ static int mport_cdev_open(struct inode
 	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;

_

Patches currently in -mm which might be from [email protected] are