From: Wang Weiyang <wangweiyang2@huawei.com>
To: <mporter@kernel.crashing.org>, <alex.bou9@gmail.com>,
<akpm@linux-foundation.org>, <yangyingliang@huawei.com>,
<jakobkoschel@gmail.com>, <jhubbard@nvidia.com>,
<error27@gmail.com>, <wangweiyang2@huawei.com>
Cc: <linux-kernel@vger.kernel.org>
Subject: [PATCH v2] rapidio: fix possible UAF when kfifo_alloc() fails
Date: Sat, 19 Nov 2022 12:03:35 +0800 [thread overview]
Message-ID: <20221119040335.46794-1-wangweiyang2@huawei.com> (raw)
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")
Signed-off-by: Wang Weiyang <wangweiyang2@huawei.com>
---
Changes in v2:
- Avoid adding the new instance onto the list until the new instance
has been fully initialized.
drivers/rapidio/devices/rio_mport_cdev.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/rapidio/devices/rio_mport_cdev.c b/drivers/rapidio/devices/rio_mport_cdev.c
index 3cc83997a1f8..86b28c4cd906 100644
--- a/drivers/rapidio/devices/rio_mport_cdev.c
+++ b/drivers/rapidio/devices/rio_mport_cdev.c
@@ -1904,10 +1904,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);
@@ -1920,6 +1916,9 @@ static int mport_cdev_open(struct inode *inode, struct file *filp)
ret = -ENOMEM;
goto err_fifo;
}
+ mutex_lock(&chdev->file_mutex);
+ list_add_tail(&priv->list, &chdev->file_list);
+ mutex_unlock(&chdev->file_mutex);
#ifdef CONFIG_RAPIDIO_DMA_ENGINE
INIT_LIST_HEAD(&priv->async_list);
--
2.17.1
next reply other threads:[~2022-11-19 3:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-19 4:03 Wang Weiyang [this message]
2022-11-21 22:04 ` Andrew Morton
2022-11-22 3:45 ` wangweiyang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221119040335.46794-1-wangweiyang2@huawei.com \
--to=wangweiyang2@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=alex.bou9@gmail.com \
--cc=error27@gmail.com \
--cc=jakobkoschel@gmail.com \
--cc=jhubbard@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mporter@kernel.crashing.org \
--cc=yangyingliang@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®