From: Zhihao Cheng <chengzhihao1@huawei.com>
To: "Dan Carpenter" <dan.carpenter@linaro.org>,
"Michał Kępień" <kernel@kempniu.pl>
Cc: Miquel Raynal <miquel.raynal@bootlin.com>,
Richard Weinberger <richard@nod.at>,
Vignesh Raghavendra <vigneshr@ti.com>,
<linux-mtd@lists.infradead.org>, <linux-kernel@vger.kernel.org>,
<kernel-janitors@vger.kernel.org>
Subject: Re: [PATCH] mtdchar: fix integer overflow in read/write ioctls
Date: Sat, 7 Dec 2024 12:17:33 +0800 [thread overview]
Message-ID: <e3da1bba-9740-6b6f-385a-1bdf25f056a9@huawei.com> (raw)
In-Reply-To: <020f98d2-eee1-434e-8236-775cca9fd157@stanley.mountain>
在 2024/12/7 4:26, Dan Carpenter 写道:
> The "req.start" and "req.len" variables are u64 values that come from the
> user at the start of the function. We mask away the high 32 bits of
> "req.len" so that's capped at U32_MAX but the "req.start" variable can go
> up to U64_MAX.
>
> Use check_add_overflow() to fix this bug.
>
> Fixes: 6420ac0af95d ("mtdchar: prevent unbounded allocation in MEMWRITE ioctl")
Hi, Dan. Why this fix tag? I think the adding result('req.start' and
'req.len') could be overflow too before this commit.
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> ---
> drivers/mtd/mtdchar.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
> index 8dc4f5c493fc..335c702633ff 100644
> --- a/drivers/mtd/mtdchar.c
> +++ b/drivers/mtd/mtdchar.c
> @@ -599,6 +599,7 @@ mtdchar_write_ioctl(struct mtd_info *mtd, struct mtd_write_req __user *argp)
> uint8_t *datbuf = NULL, *oobbuf = NULL;
> size_t datbuf_len, oobbuf_len;
> int ret = 0;
> + u64 end;
>
> if (copy_from_user(&req, argp, sizeof(req)))
> return -EFAULT;
> @@ -618,7 +619,7 @@ mtdchar_write_ioctl(struct mtd_info *mtd, struct mtd_write_req __user *argp)
> req.len &= 0xffffffff;
> req.ooblen &= 0xffffffff;
>
> - if (req.start + req.len > mtd->size)
> + if (check_add_overflow(req.start, req.len, &end) || end > mtd->size)
> return -EINVAL;
>
> datbuf_len = min_t(size_t, req.len, mtd->erasesize);
> @@ -698,6 +699,7 @@ mtdchar_read_ioctl(struct mtd_info *mtd, struct mtd_read_req __user *argp)
> size_t datbuf_len, oobbuf_len;
> size_t orig_len, orig_ooblen;
> int ret = 0;
> + u64 end;
>
> if (copy_from_user(&req, argp, sizeof(req)))
> return -EFAULT;
> @@ -724,7 +726,7 @@ mtdchar_read_ioctl(struct mtd_info *mtd, struct mtd_read_req __user *argp)
> req.len &= 0xffffffff;
> req.ooblen &= 0xffffffff;
>
> - if (req.start + req.len > mtd->size) {
> + if (check_add_overflow(req.start, req.len, &end) || end > mtd->size) {
> ret = -EINVAL;
> goto out;
> }
>
next prev parent reply other threads:[~2024-12-07 4:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-06 20:26 Dan Carpenter
2024-12-07 4:17 ` Zhihao Cheng [this message]
2024-12-07 17:05 ` Dan Carpenter
2024-12-09 6:27 ` Zhihao Cheng
2024-12-09 7:37 ` Dan Carpenter
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=e3da1bba-9740-6b6f-385a-1bdf25f056a9@huawei.com \
--to=chengzhihao1@huawei.com \
--cc=dan.carpenter@linaro.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=kernel@kempniu.pl \
--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 \
/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®