From: "Leizhen (ThunderTown)" <thunder.leizhen@huawei.com>
To: Christoph Hellwig <hch@infradead.org>
Cc: "Darrick J . Wong" <djwong@kernel.org>,
linux-xfs <linux-xfs@vger.kernel.org>,
linux-fsdevel <linux-fsdevel@vger.kernel.org>,
linux-kernel <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH -next 1/1] iomap: Fix a false positive of UBSAN in iomap_seek_data()
Date: Mon, 5 Jul 2021 11:29:44 +0800 [thread overview]
Message-ID: <9a619cb0-e998-83e5-8e42-d3606ab682e0@huawei.com> (raw)
In-Reply-To: <2ce02a7f-4b8b-5a86-13ee-097aff084f82@huawei.com>
On 2021/7/2 19:50, Leizhen (ThunderTown) wrote:
>
>
> On 2021/7/2 17:34, Christoph Hellwig wrote:
>> We might as well just kill off the length variable while we're at it:
>
> Hi, Christoph:
> Maybe you need to write a separate patch. Because the patch I sent is
> to modify function iomap_seek_data(). I didn't look at the other functions.
> In fact, both iomap_seek_data() and iomap_seek_hole() need to be modified.
> The iomap_seek_data() may not be intuitive to delete the variable 'length'.
>
> I'm now analyzing if the "if (length <= 0)" statement in iomap_seek_data()
> is redundant (the condition is never true).
I've thought about it, and that "if" statement can be removed as follows:
diff --git a/fs/iomap/seek.c b/fs/iomap/seek.c
index dab1b02eba5b..dc55f9ecd948 100644
--- a/fs/iomap/seek.c
+++ b/fs/iomap/seek.c
@@ -96,14 +96,13 @@ iomap_seek_data(struct inode *inode, loff_t offset, const struct iomap_ops *ops)
if (ret < 0)
return ret;
if (ret == 0)
- break;
+ return offset;
offset += ret;
length -= ret;
}
- if (length <= 0)
- return -ENXIO;
- return offset;
+ /* The end of the file is reached, and no data is found */
+ return -ENXIO;
}
EXPORT_SYMBOL_GPL(iomap_seek_data);
>
>>
>>
>> diff --git a/fs/iomap/seek.c b/fs/iomap/seek.c
>> index dab1b02eba5b7f..942e354e9e13e6 100644
>> --- a/fs/iomap/seek.c
>> +++ b/fs/iomap/seek.c
>> @@ -35,23 +35,21 @@ loff_t
>> iomap_seek_hole(struct inode *inode, loff_t offset, const struct iomap_ops *ops)
>> {
>> loff_t size = i_size_read(inode);
>> - loff_t length = size - offset;
>> loff_t ret;
>>
>> /* Nothing to be found before or beyond the end of the file. */
>> if (offset < 0 || offset >= size)
>> return -ENXIO;
>>
>> - while (length > 0) {
>> - ret = iomap_apply(inode, offset, length, IOMAP_REPORT, ops,
>> - &offset, iomap_seek_hole_actor);
>> + while (offset < size) {
>> + ret = iomap_apply(inode, offset, size - offset, IOMAP_REPORT,
>> + ops, &offset, iomap_seek_hole_actor);
>> if (ret < 0)
>> return ret;
>> if (ret == 0)
>> break;
>>
>> offset += ret;
>> - length -= ret;
>> }
>>
>> return offset;
>>
>> .
>>
next prev parent reply other threads:[~2021-07-05 3:29 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-02 9:21 [PATCH -next 1/1] iomap: Fix a false positive of UBSAN in iomap_seek_data() Zhen Lei
2021-07-02 9:34 ` Christoph Hellwig
2021-07-02 11:50 ` Leizhen (ThunderTown)
2021-07-05 3:29 ` Leizhen (ThunderTown) [this message]
2021-07-05 3:43 ` Matthew Wilcox
2021-07-05 4:05 ` Leizhen (ThunderTown)
2021-07-04 13:51 ` Matthew Wilcox
2021-07-02 19:56 ` Matthew Wilcox
2021-07-05 3:35 ` Leizhen (ThunderTown)
2021-07-06 11:08 ` Matthew Wilcox
2021-07-06 11:59 ` Matthew Wilcox
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=9a619cb0-e998-83e5-8e42-d3606ab682e0@huawei.com \
--to=thunder.leizhen@huawei.com \
--cc=djwong@kernel.org \
--cc=hch@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).