summaryrefslogtreecommitdiff
path: root/mm/vmalloc.c
diff options
context:
space:
mode:
authorSteven Rostedt (VMware) <rostedt@goodmis.org>2019-04-28 13:45:31 -0400
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2019-04-28 13:45:31 -0400
commit344284eab562fa69e9c0c0f45c79d7227f5f2858 (patch)
tree05928aace65aef5390d34bb8e4752c646954c4db /mm/vmalloc.c
parentd26b2fc5c0474086af79d33554a133247e8e69c3 (diff)
parent19bb613acb9ad8e57593cad5118acaee117cc303 (diff)
Merge tag 'v4.19.37' into v4.19-rt
This is the 4.19.37 stable release Conflicts: include/linux/sched/mm.h kernel/sched/fair.c
Diffstat (limited to 'mm/vmalloc.c')
-rw-r--r--mm/vmalloc.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 32e43ad5bbdb..5c6939cc28b7 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -498,7 +498,11 @@ nocache:
}
found:
- if (addr + size > vend)
+ /*
+ * Check also calculated address against the vstart,
+ * because it can be 0 because of big align request.
+ */
+ if (addr + size > vend || addr < vstart)
goto overflow;
va->va_start = addr;