All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] mm: thp: avoid uninitialized variable use
@ 2017-12-15 12:51 ` Arnd Bergmann
  0 siblings, 0 replies; 10+ messages in thread
From: Arnd Bergmann @ 2017-12-15 12:51 UTC (permalink / raw)
  To: Andrew Morton, Michal Hocko, Kirill A. Shutemov
  Cc: Arnd Bergmann, Stephen Rothwell, Vlastimil Babka, David Rientjes,
	Ingo Molnar, Yang Shi, linux-mm, linux-kernel

When the down_read_trylock() fails, 'vma' has not been initialized
yet, which gcc now warns about:

mm/khugepaged.c: In function 'khugepaged':
mm/khugepaged.c:1659:25: error: 'vma' may be used uninitialized in this function [-Werror=maybe-uninitialized]

Presumable we are not supposed to call find_vma() without the mmap_sem
either, so setting it to NULL for this case seems appropriate.

Fixes: 0951b59acf3a ("mm: thp: use down_read_trylock() in khugepaged to avoid long block")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
I'm not completely sure this patch is sufficient, it gets rid of
the warning, but it would be good to have the code reviewed better
to see if other problems remain that result from down_read_trylock()
patch.
---
 mm/khugepaged.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/mm/khugepaged.c b/mm/khugepaged.c
index 521b908f9600..b7e2268dfc9a 100644
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -1677,11 +1677,10 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages,
 	 * Don't wait for semaphore (to avoid long wait times).  Just move to
 	 * the next mm on the list.
 	 */
+	vma = NULL;
 	if (unlikely(!down_read_trylock(&mm->mmap_sem)))
 		goto breakouterloop_mmap_sem;
-	if (unlikely(khugepaged_test_exit(mm)))
-		vma = NULL;
-	else
+	if (likely(!khugepaged_test_exit(mm)))
 		vma = find_vma(mm, khugepaged_scan.address);
 
 	progress++;
-- 
2.9.0

^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2017-12-16 22:25 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-15 12:51 [PATCH] mm: thp: avoid uninitialized variable use Arnd Bergmann
2017-12-15 12:51 ` Arnd Bergmann
2017-12-15 13:03 ` Michal Hocko
2017-12-15 13:03   ` Michal Hocko
2017-12-15 18:01 ` Yang Shi
2017-12-15 18:01   ` Yang Shi
2017-12-16 12:24   ` Arnd Bergmann
2017-12-16 12:24     ` Arnd Bergmann
2017-12-16 22:25     ` Yang Shi
2017-12-16 22:25       ` Yang Shi

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.