提交 95cdbea7 编写于 作者: A Arnd Bergmann 提交者: Yang Yingliang

mm/vmalloc.c: avoid bogus -Wmaybe-uninitialized warning

mainline inclusion
from mainline-5.2-rc7
commit 2c929233
category: bugfix
bugzilla: 15766
CVE: NA

-------------------------------------------------
gcc gets confused in pcpu_get_vm_areas() because there are too many
branches that affect whether 'lva' was initialized before it gets used:

  mm/vmalloc.c: In function 'pcpu_get_vm_areas':
  mm/vmalloc.c:991:4: error: 'lva' may be used uninitialized in this function [-Werror=maybe-uninitialized]
      insert_vmap_area_augment(lva, &va->rb_node,
      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
       &free_vmap_area_root, &free_vmap_area_list);
       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  mm/vmalloc.c:916:20: note: 'lva' was declared here
    struct vmap_area *lva;
                      ^~~

Add an intialization to NULL, and check whether this has changed before
the first use.

[akpm@linux-foundation.org: tweak comments]
Link: http://lkml.kernel.org/r/20190618092650.2943749-1-arnd@arndb.de
Fixes: 68ad4a33 ("mm/vmalloc.c: keep track of free blocks for vmap allocation")
Signed-off-by: NArnd Bergmann <arnd@arndb.de>
Reviewed-by: NUladzislau Rezki (Sony) <urezki@gmail.com>
Cc: Joel Fernandes <joelaf@google.com>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit 2c929233)
Signed-off-by: NKefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: NHanjun Guo <guohanjun@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 ba00c205
...@@ -911,7 +911,7 @@ adjust_va_to_fit_type(struct vmap_area *va, ...@@ -911,7 +911,7 @@ adjust_va_to_fit_type(struct vmap_area *va,
unsigned long nva_start_addr, unsigned long size, unsigned long nva_start_addr, unsigned long size,
enum fit_type type) enum fit_type type)
{ {
struct vmap_area *lva; struct vmap_area *lva = NULL;
if (type == FL_FIT_TYPE) { if (type == FL_FIT_TYPE) {
/* /*
...@@ -970,7 +970,7 @@ adjust_va_to_fit_type(struct vmap_area *va, ...@@ -970,7 +970,7 @@ adjust_va_to_fit_type(struct vmap_area *va,
if (type != FL_FIT_TYPE) { if (type != FL_FIT_TYPE) {
augment_tree_propagate_from(va); augment_tree_propagate_from(va);
if (type == NE_FIT_TYPE) if (lva) /* type == NE_FIT_TYPE */
insert_vmap_area_augment(lva, &va->rb_node, insert_vmap_area_augment(lva, &va->rb_node,
&free_vmap_area_root, &free_vmap_area_list); &free_vmap_area_root, &free_vmap_area_list);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册