From: Andreas Gruenbacher <agruenba@redhat.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Matthew Wilcox <willy@infradead.org>,
David Sterba <dsterba@suse.com>,
linux-fsdevel@vger.kernel.org,
Pankaj Raghav <p.raghav@samsung.com>,
Konstantin Komarov <almaz.alexandrovich@paragon-software.com>,
ntfs3@lists.linux.dev, Theodore Tso <tytso@mit.edu>,
Jan Kara <jack@suse.com>,
linux-ext4@vger.kernel.org,
Andreas Gruenbacher <agruenba@redhat.com>
Subject: [PATCH] highmem: memcpy_{from,to}_folio() fix
Date: Wed, 2 Aug 2023 16:43:54 +0200 [thread overview]
Message-ID: <20230802144354.1023099-1-agruenba@redhat.com> (raw)
memcpy_to_folio() and memcpy_from_folio() compute the size of the chunk
of memory they can copy for each page, but then they don't use the chunk
size in the actual memcpy. Fix that.
Also, git rid of superfluous parentheses in these two functions.
Fixes: 520a10fe2d72 ("highmem: add memcpy_to_folio() and memcpy_from_folio()")
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
---
include/linux/highmem.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/linux/highmem.h b/include/linux/highmem.h
index 0280f57d4744..99c474de800d 100644
--- a/include/linux/highmem.h
+++ b/include/linux/highmem.h
@@ -445,13 +445,13 @@ static inline void memcpy_from_folio(char *to, struct folio *folio,
VM_BUG_ON(offset + len > folio_size(folio));
do {
- char *from = kmap_local_folio(folio, offset);
+ const char *from = kmap_local_folio(folio, offset);
size_t chunk = len;
if (folio_test_highmem(folio) &&
- (chunk > (PAGE_SIZE - offset_in_page(offset))))
+ chunk > PAGE_SIZE - offset_in_page(offset))
chunk = PAGE_SIZE - offset_in_page(offset);
- memcpy(to, from, len);
+ memcpy(to, from, chunk);
kunmap_local(from);
from += chunk;
@@ -470,9 +470,9 @@ static inline void memcpy_to_folio(struct folio *folio, size_t offset,
size_t chunk = len;
if (folio_test_highmem(folio) &&
- (chunk > (PAGE_SIZE - offset_in_page(offset))))
+ chunk > PAGE_SIZE - offset_in_page(offset))
chunk = PAGE_SIZE - offset_in_page(offset);
- memcpy(to, from, len);
+ memcpy(to, from, chunk);
kunmap_local(to);
from += chunk;
--
2.40.1
reply other threads:[~2023-08-02 14:43 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20230802144354.1023099-1-agruenba@redhat.com \
--to=agruenba@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=almaz.alexandrovich@paragon-software.com \
--cc=dsterba@suse.com \
--cc=jack@suse.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=ntfs3@lists.linux.dev \
--cc=p.raghav@samsung.com \
--cc=tytso@mit.edu \
--cc=willy@infradead.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 read-only IMAP folder(s) and NNTP newsgroup(s).