s390/vdso: remove BUG_ON()

Handle allocation error gracefully and simply disable vdso instead of
leaving the system in an undefined state.

Reviewed-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/arch/s390/kernel/vdso.c b/arch/s390/kernel/vdso.c
index 7075459aed51845356bdce7272a5bcb030c8e097..f06791c085e74be60b18c3d6756d3b32c2cf40c4 100644 (file)
--- a/arch/s390/kernel/vdso.c
+++ b/arch/s390/kernel/vdso.c
@@ -175,7 +175,10 @@ static int __init vdso_init(void)
        /* Make sure pages are in the correct state */
        vdso64_pagelist = kcalloc(vdso64_pages + 1, sizeof(struct page *),
                                  GFP_KERNEL);
-       BUG_ON(vdso64_pagelist == NULL);
+       if (!vdso64_pagelist) {
+               vdso_enabled = 0;
+               return -ENOMEM;
+       }
        for (i = 0; i < vdso64_pages - 1; i++) {
                struct page *pg = virt_to_page(vdso64_kbase + i*PAGE_SIZE);
                get_page(pg);