From: Arnd Bergmann <arnd@kernel.org>
To: Andrew Morton <akpm@linux-foundation.org>,
Lorenzo Stoakes <lstoakes@gmail.com>
Cc: Arnd Bergmann <arnd@arndb.de>,
Uladzislau Rezki <urezki@gmail.com>,
Christoph Hellwig <hch@infradead.org>,
Baoquan He <bhe@redhat.com>, David Hildenbrand <david@redhat.com>,
Andrey Konovalov <andreyknvl@gmail.com>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/3] mm: vmalloc: fix vmap_ram_vread_iter() return value
Date: Thu, 23 Mar 2023 12:58:35 +0100 [thread overview]
Message-ID: <20230323115903.1483668-2-arnd@kernel.org> (raw)
In-Reply-To: <20230323115903.1483668-1-arnd@kernel.org>
From: Arnd Bergmann <arnd@arndb.de>
The error handling in vmap_ram_vread_iter() can return an
uninitialized value in some cases:
mm/vmalloc.c:3539:6: error: variable 'remains' is used uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized]
if (!vb)
^~~
mm/vmalloc.c:3587:17: note: uninitialized use occurs here
return count - remains + zero_iter(iter, remains);
^~~~~~~
Move the initialization up a few lines.
Fixes: d9cab54f7737 ("mm: vmalloc: convert vread() to vread_iter()")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
mm/vmalloc.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index ebfa1e9fe6f9..fb216495fe5a 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -3521,7 +3521,7 @@ static size_t vmap_ram_vread_iter(struct iov_iter *iter, const char *addr,
struct vmap_block *vb;
unsigned long offset;
unsigned int rs, re;
- size_t remains, n;
+ size_t remains = count, n;
/*
* If it's area created by vm_map_ram() interface directly, but
@@ -3545,7 +3545,6 @@ static size_t vmap_ram_vread_iter(struct iov_iter *iter, const char *addr,
goto finished_zero;
}
- remains = count;
for_each_set_bitrange(rs, re, vb->used_map, VMAP_BBMAP_BITS) {
size_t copied;
--
2.39.2
next prev parent reply other threads:[~2023-03-23 11:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-23 11:58 [PATCH 1/3] mm/mmap/vma_merge: actually set next to NULL if not applicable Arnd Bergmann
2023-03-23 11:58 ` Arnd Bergmann [this message]
2023-03-23 12:05 ` [PATCH 2/3] mm: vmalloc: fix vmap_ram_vread_iter() return value Lorenzo Stoakes
2023-03-23 11:58 ` [PATCH 3/3] mm: vmalloc: mark zero_iter() static Arnd Bergmann
2023-03-23 12:06 ` Lorenzo Stoakes
2023-03-23 12:03 ` [PATCH 1/3] mm/mmap/vma_merge: actually set next to NULL if not applicable Lorenzo Stoakes
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=20230323115903.1483668-2-arnd@kernel.org \
--to=arnd@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=andreyknvl@gmail.com \
--cc=arnd@arndb.de \
--cc=bhe@redhat.com \
--cc=david@redhat.com \
--cc=hch@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=lstoakes@gmail.com \
--cc=urezki@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.