diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2023-04-18 14:53:49 -0700 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2023-04-18 14:53:49 -0700 |
| commit | f8f238ffe5e96a924a2ddbbaa872231fbf2c0d7b (patch) | |
| tree | 6d1a2fc13d6d1e0737888bd3a7a8387097fbeb05 /mm/vmalloc.c | |
| parent | e492cd61b986590a45c674ede7dd1c4dbf94cf24 (diff) | |
| parent | ef832747a82dfbc22a3702219cc716f449b24e4a (diff) | |
sync mm-stable with mm-hotfixes-stable to pick up depended-upon upstream changes
Diffstat (limited to 'mm/vmalloc.c')
| -rw-r--r-- | mm/vmalloc.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 3fa476f17887..63a22557dc55 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -313,8 +313,8 @@ int ioremap_page_range(unsigned long addr, unsigned long end, ioremap_max_page_shift); flush_cache_vmap(addr, end); if (!err) - kmsan_ioremap_page_range(addr, end, phys_addr, prot, - ioremap_max_page_shift); + err = kmsan_ioremap_page_range(addr, end, phys_addr, prot, + ioremap_max_page_shift); return err; } @@ -605,7 +605,11 @@ int __vmap_pages_range_noflush(unsigned long addr, unsigned long end, int vmap_pages_range_noflush(unsigned long addr, unsigned long end, pgprot_t prot, struct page **pages, unsigned int page_shift) { - kmsan_vmap_pages_range_noflush(addr, end, prot, pages, page_shift); + int ret = kmsan_vmap_pages_range_noflush(addr, end, prot, pages, + page_shift); + + if (ret) + return ret; return __vmap_pages_range_noflush(addr, end, prot, pages, page_shift); } |