From: ZhaoLong Wang <wangzhaolong1@huawei.com>
To: Zhihao Cheng <chengzhihao1@huawei.com>, <richard@nod.at>,
<miquel.raynal@bootlin.com>, <vigneshr@ti.com>
Cc: <linux-mtd@lists.infradead.org>, <linux-kernel@vger.kernel.org>,
<yi.zhang@huawei.com>, <yangerkun@huawei.com>
Subject: Re: [PATCH RFC] ubi: gluebi: Fix NULL pointer dereference caused by ftl notifier
Date: Thu, 12 Oct 2023 16:04:02 +0800 [thread overview]
Message-ID: <a8a2dc17-7a7a-e725-8ae2-e7e0146150f0@huawei.com> (raw)
In-Reply-To: <b972f615-3882-18cf-5b44-7ec021f92e0a@huawei.com>
I'm very happy to receive a reply to the review.
> 2. fd = open(/dev/ubi0_0, O_WRONLY)
> ubi_open_volume // vol->writers = 1
>
> P1 P2
> gluebi_create -> mtd_device_register -> add_mtd_device:
> device_register // dev/mtd1 is visible
>
> fd = open(/dev/mtd1, O_WRONLY)
> gluebi_get_device
> gluebi->desc = ubi_open_volume
> gluebi->desc = ERR_PTR(EBUSY)
>
> ftl_add_mtd
> mtd_read
> gluebi_read
> gluebi->desc is ERR_PTR (√)
The reproduction steps for situations 2 and 3 have been added to link[1].
Link: https://bugzilla.kernel.org/show_bug.cgi?id=217992 [1]
> 3. P1 P2
> gluebi_create -> mtd_device_register -> add_mtd_device:
> device_register // dev/mtd1 is visible
>
> fd = open(/dev/mtd1, O_WRONLY)
> gluebi_get_device
> gluebi->desc = ubi_open_volume
>
> ftl_add_mtd
> mtd_read
> gluebi_read
> gluebi->desc is not ERR_PTR/NULL
>
> close(fd)
> gluebi_put_device
> ubi_close_volume
> kfree(desc)
> ubi_read(gluebi->desc) // UAF (×)
>
Yes, it's also a problem. Perhaps it should be set to NULL after
destroying gluebi->desc.
>
> No need to modify 'gluebi_write' and 'gluebi_erase'.
>
The patch is as follows:
diff --git a/drivers/mtd/ubi/gluebi.c b/drivers/mtd/ubi/gluebi.c
index 1b980d15d9fb..8fc6017d1155 100644
--- a/drivers/mtd/ubi/gluebi.c
+++ b/drivers/mtd/ubi/gluebi.c
@@ -85,6 +85,7 @@ static int gluebi_get_device(struct mtd_info *mtd)
{
struct gluebi_device *gluebi;
int ubi_mode = UBI_READONLY;
+ struct ubi_volume_desc *vdesc;
if (mtd->flags & MTD_WRITEABLE)
ubi_mode = UBI_READWRITE;
@@ -109,12 +110,14 @@ static int gluebi_get_device(struct mtd_info *mtd)
* This is the first reference to this UBI volume via the MTD device
* interface. Open the corresponding volume in read-write mode.
*/
- gluebi->desc = ubi_open_volume(gluebi->ubi_num, gluebi->vol_id,
+ vdesc = ubi_open_volume(gluebi->ubi_num, gluebi->vol_id,
ubi_mode);
- if (IS_ERR(gluebi->desc)) {
+ if (IS_ERR(vdesc)) {
+ gluebi->desc = NULL;
mutex_unlock(&devices_mutex);
- return PTR_ERR(gluebi->desc);
+ return PTR_ERR(vdesc);
}
+ gluebi->desc = vdesc;
gluebi->refcnt += 1;
mutex_unlock(&devices_mutex);
return 0;
@@ -134,8 +137,10 @@ static void gluebi_put_device(struct mtd_info *mtd)
gluebi = container_of(mtd, struct gluebi_device, mtd);
mutex_lock(&devices_mutex);
gluebi->refcnt -= 1;
- if (gluebi->refcnt == 0)
+ if (gluebi->refcnt == 0) {
ubi_close_volume(gluebi->desc);
+ gluebi->desc = NULL;
+ }
mutex_unlock(&devices_mutex);
}
@@ -154,9 +159,26 @@ static int gluebi_read(struct mtd_info *mtd, loff_t
from, size_t len,
size_t *retlen, unsigned char *buf)
{
int err = 0, lnum, offs, bytes_left;
- struct gluebi_device *gluebi;
+ struct gluebi_device *gluebi = container_of(mtd, struct gluebi_device,
+ mtd);
+ int isnt_get = unlikely(gluebi->desc == NULL) ? 1 : 0;
+
+ /**
+ * In normal case, the UBI volume desc has been initialized by
+ * ->_get_device(). However, in the ftl notifier process, the
+ * ->_get_device() is not executed in advance and the MTD device
+ * is directly scanned which cause null pointe dereference.
+ * Therefore, try to get the MTD device here.
+ */
+ if (unlikely(isnt_get)) {
+ err = __get_mtd_device(mtd);
+ if (err) {
+ err_msg("cannot get MTD device %d, UBI device %d, volume %d, error %d",
+ mtd->index, gluebi->ubi_num, gluebi->vol_id, err);
+ return err;
+ }
+ }
- gluebi = container_of(mtd, struct gluebi_device, mtd);
lnum = div_u64_rem(from, mtd->erasesize, &offs);
bytes_left = len;
while (bytes_left) {
@@ -176,6 +198,9 @@ static int gluebi_read(struct mtd_info *mtd, loff_t
from, size_t len,
}
*retlen = len - bytes_left;
+
+ if (unlikely(isnt_get))
+ __put_mtd_device(mtd);
return err;
}
next prev parent reply other threads:[~2023-10-12 8:04 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-10 14:29 ZhaoLong Wang
2023-10-11 2:32 ` ZhaoLong Wang
2023-10-12 2:38 ` Zhihao Cheng
2023-10-12 8:04 ` ZhaoLong Wang [this message]
2023-10-12 8:18 ` Zhihao Cheng
2023-10-12 9:31 ` ZhaoLong Wang
2023-10-12 11:25 ` Zhihao Cheng
2023-10-12 2:17 ` Zhihao Cheng
2023-10-12 11:31 ` ZhaoLong Wang
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=a8a2dc17-7a7a-e725-8ae2-e7e0146150f0@huawei.com \
--to=wangzhaolong1@huawei.com \
--cc=chengzhihao1@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=miquel.raynal@bootlin.com \
--cc=richard@nod.at \
--cc=vigneshr@ti.com \
--cc=yangerkun@huawei.com \
--cc=yi.zhang@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®