The patch titled
Subject: kexec-add-restriction-on-kexec_load-segment-sizes-fix
has been removed from the -mm tree. Its filename was
kexec-add-restriction-on-kexec_load-segment-sizes-fix.patch
This patch was dropped because it was folded into kexec-add-restriction-on-kexec_load-segment-sizes.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: kexec-add-restriction-on-kexec_load-segment-sizes-fix
fix for kexec-return-error-number-directly.patch, update comment
Cc: zhong jiang <zhongjiang@xxxxxxxxxx>
Cc: Eric W. Biederman <ebiederm@xxxxxxxxxxxx>
Cc: Vivek Goyal <vgoyal@xxxxxxxxxx>
Cc: Dave Young <dyoung@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/kexec_core.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff -puN kernel/kexec_core.c~kexec-add-restriction-on-kexec_load-segment-sizes-fix kernel/kexec_core.c
--- a/kernel/kexec_core.c~kexec-add-restriction-on-kexec_load-segment-sizes-fix
+++ a/kernel/kexec_core.c
@@ -217,20 +217,19 @@ int sanity_check_segment_list(struct kim
}
/*
- * Verify that no segment is larger than half of memory.
- * If a segment from userspace is too large, a large amount
- * of time will be wasted allocating pages, which can cause
- * * a soft lockup.
+ * Verify that no more than half of memory will be consumed. If the
+ * request from userspace is too large, a large amount of time will be
+ * wasted allocating pages, which can cause a soft lockup.
*/
for (i = 0; i < nr_segments; i++) {
if (PAGE_COUNT(image->segment[i].memsz) > totalram_pages / 2)
- return result;
+ return -EINVAL;
total_pages += PAGE_COUNT(image->segment[i].memsz);
}
if (total_pages > totalram_pages / 2)
- return result;
+ return -EINVAL;
/*
* Verify we have good destination addresses. Normally
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
kexec-add-restriction-on-kexec_load-segment-sizes.patch
powerpc-fsl_rio-apply-changes-for-rio-spec-rev-3-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
