diff for duplicates of <20170227215745.GA28416@codeblueprint.co.uk> diff --git a/a/1.txt b/N1/1.txt index e9e6e89..ab12404 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,63 +12,3 @@ situation where A) memblock would be unavailable and B) returning an error would prevent us from making progress. ---->8---- - ->From 1c1c06664d23c5d256016918c54e01802af4e891 Mon Sep 17 00:00:00 2001 -From: Matt Fleming <matt@codeblueprint.co.uk> -Date: Mon, 27 Feb 2017 21:14:29 +0000 -Subject: [PATCH] mm/memblock: Warn if used after slab is up and prevent memory - corruption - -Historically there have been many memory corruption bugs caused by -using the memblock API after its internal data structures have been -destroyed. The latest bug was fixed in commit, - - 20b1e22d01a4 ("x86/efi: Don't allocate memmap through memblock after mm_init()") - -Instead of modifying the memblock data structures that no longer exist -and silently corrupting memory, WARN and return with an error. - -Cc: Nicolai Stange <nicstange@gmail.com> -Cc: Dave Young <dyoung@redhat.com> -Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> -Cc: Mel Gorman <mgorman@techsingularity.net> -Cc: Andrew Morton <akpm@linux-foundation.org> -Cc: Vlastimil Babka <vbabka@suse.cz> -Cc: Michal Hocko <mhocko@suse.cz> -Signed-off-by: Matt Fleming <matt@codeblueprint.co.uk> ---- - mm/memblock.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/mm/memblock.c b/mm/memblock.c -index 7608bc305936..4dbd86f2fddb 100644 ---- a/mm/memblock.c -+++ b/mm/memblock.c -@@ -530,6 +530,9 @@ int __init_memblock memblock_add_range(struct memblock_type *type, - if (!size) - return 0; - -+ if (WARN_ONCE(slab_is_available(), "memblock no longer available\n")) -+ return -EINVAL; -+ - /* special case for empty array */ - if (type->regions[0].size == 0) { - WARN_ON(type->cnt != 1 || type->total_size); -@@ -648,6 +651,9 @@ static int __init_memblock memblock_isolate_range(struct memblock_type *type, - if (!size) - return 0; - -+ if (WARN_ONCE(slab_is_available(), "memblock no longer available\n")) -+ return -EINVAL; -+ - /* we'll create at most two more regions */ - while (type->cnt + 2 > type->max) - if (memblock_double_array(type, base, size) < 0) --- -2.10.0 - --- -To unsubscribe, send a message with 'unsubscribe linux-mm' in -the body to majordomo@kvack.org. For more info on Linux MM, -see: http://www.linux-mm.org/ . -Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N1/content_digest index 009bf9e..6906800 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -36,66 +36,6 @@ "situation where A) memblock would be unavailable and B) returning an\n" "error would prevent us from making progress.\n" "\n" - "---->8----\n" - "\n" - ">From 1c1c06664d23c5d256016918c54e01802af4e891 Mon Sep 17 00:00:00 2001\n" - "From: Matt Fleming <matt@codeblueprint.co.uk>\n" - "Date: Mon, 27 Feb 2017 21:14:29 +0000\n" - "Subject: [PATCH] mm/memblock: Warn if used after slab is up and prevent memory\n" - " corruption\n" - "\n" - "Historically there have been many memory corruption bugs caused by\n" - "using the memblock API after its internal data structures have been\n" - "destroyed. The latest bug was fixed in commit,\n" - "\n" - " 20b1e22d01a4 (\"x86/efi: Don't allocate memmap through memblock after mm_init()\")\n" - "\n" - "Instead of modifying the memblock data structures that no longer exist\n" - "and silently corrupting memory, WARN and return with an error.\n" - "\n" - "Cc: Nicolai Stange <nicstange@gmail.com>\n" - "Cc: Dave Young <dyoung@redhat.com>\n" - "Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>\n" - "Cc: Mel Gorman <mgorman@techsingularity.net>\n" - "Cc: Andrew Morton <akpm@linux-foundation.org>\n" - "Cc: Vlastimil Babka <vbabka@suse.cz>\n" - "Cc: Michal Hocko <mhocko@suse.cz>\n" - "Signed-off-by: Matt Fleming <matt@codeblueprint.co.uk>\n" - "---\n" - " mm/memblock.c | 6 ++++++\n" - " 1 file changed, 6 insertions(+)\n" - "\n" - "diff --git a/mm/memblock.c b/mm/memblock.c\n" - "index 7608bc305936..4dbd86f2fddb 100644\n" - "--- a/mm/memblock.c\n" - "+++ b/mm/memblock.c\n" - "@@ -530,6 +530,9 @@ int __init_memblock memblock_add_range(struct memblock_type *type,\n" - " \tif (!size)\n" - " \t\treturn 0;\n" - " \n" - "+\tif (WARN_ONCE(slab_is_available(), \"memblock no longer available\\n\"))\n" - "+\t\treturn -EINVAL;\n" - "+\n" - " \t/* special case for empty array */\n" - " \tif (type->regions[0].size == 0) {\n" - " \t\tWARN_ON(type->cnt != 1 || type->total_size);\n" - "@@ -648,6 +651,9 @@ static int __init_memblock memblock_isolate_range(struct memblock_type *type,\n" - " \tif (!size)\n" - " \t\treturn 0;\n" - " \n" - "+\tif (WARN_ONCE(slab_is_available(), \"memblock no longer available\\n\"))\n" - "+\t\treturn -EINVAL;\n" - "+\n" - " \t/* we'll create at most two more regions */\n" - " \twhile (type->cnt + 2 > type->max)\n" - " \t\tif (memblock_double_array(type, base, size) < 0)\n" - "-- \n" - "2.10.0\n" - "\n" - "--\n" - "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" - "the body to majordomo@kvack.org. For more info on Linux MM,\n" - "see: http://www.linux-mm.org/ .\n" - "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" + ---->8---- -c1560db42c6fde85f96fff51f68b0d89fa54cf10c5b5c7edd15048ba7e34c77a +50bb1427f5a9a95fb9ebfb0140d772edf72d3b212aa0972fb56bc97f68ac2197
diff --git a/a/1.txt b/N2/1.txt index e9e6e89..5db2e18 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -66,9 +66,3 @@ index 7608bc305936..4dbd86f2fddb 100644 if (memblock_double_array(type, base, size) < 0) -- 2.10.0 - --- -To unsubscribe, send a message with 'unsubscribe linux-mm' in -the body to majordomo@kvack.org. For more info on Linux MM, -see: http://www.linux-mm.org/ . -Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N2/content_digest index 009bf9e..7f784d7 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -90,12 +90,6 @@ " \twhile (type->cnt + 2 > type->max)\n" " \t\tif (memblock_double_array(type, base, size) < 0)\n" "-- \n" - "2.10.0\n" - "\n" - "--\n" - "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" - "the body to majordomo@kvack.org. For more info on Linux MM,\n" - "see: http://www.linux-mm.org/ .\n" - "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" + 2.10.0 -c1560db42c6fde85f96fff51f68b0d89fa54cf10c5b5c7edd15048ba7e34c77a +7ae1ede31d54d60caac66402130eefddb77ae0a88bfc98e0d64bcbb94cf751da
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.