Merge misc updates from Andrew Morton: - a few misc things - ocfs2 updates - most of MM * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (159 commits) tools/testing/selftests/proc/proc-self-syscall.c: remove duplicate include proc: more robust bulk read test proc: test /proc/*/maps, smaps, smaps_rollup, statm proc: use seq_puts() everywhere proc: read kernel cpu stat pointer once proc: remove unused argument in proc_pid_lookup() fs/proc/thread_self.c: code cleanup for proc_setup_thread_self() fs/proc/self.c: code cleanup for proc_setup_self() proc: return exit code 4 for skipped tests mm,mremap: bail out earlier in mremap_to under map pressure mm/sparse: fix a bad comparison mm/memory.c: do_fault: avoid usage of stale vm_area_struct writeback: fix inode cgroup switching comment mm/huge_memory.c: fix "orig_pud" set but not used mm/hotplug: fix an imbalance with DEBUG_PAGEALLOC mm/memcontrol.c: fix bad line in comment mm/cma.c: cma_declare_contiguous: correct err handling mm/page_ext.c: fix an imbalance with kmemleak mm/compaction: pass pgdat to too_many_isolated() instead of zone mm: remove zone_lru_lock() function, access ->lru_lock directly ...
Showing the changes to scripts (3 of 213 files). Show all
Unified · Split
| @@ -27,14 +27,9 @@ else · 26 unmodified lines | |||
| 27 | $(call cc-param,asan-globals=1) \ | 27 | $(call cc-param,asan-globals=1) \ |
| 28 | $(call cc-param,asan-instrumentation-with-call-threshold=$(call_threshold)) \ | 28 | $(call cc-param,asan-instrumentation-with-call-threshold=$(call_threshold)) \ |
| 29 | $(call cc-param,asan-stack=$(CONFIG_KASAN_STACK)) \ | 29 | $(call cc-param,asan-stack=$(CONFIG_KASAN_STACK)) \ |
| 30 | $(call cc-param,asan-use-after-scope=1) \ | ||
| 31 | $(call cc-param,asan-instrument-allocas=1) | 30 | $(call cc-param,asan-instrument-allocas=1) |
| 32 | endif | 31 | endif |
| 33 | 32 | ||
| 34 | ifdef CONFIG_KASAN_EXTRA | ||
| 35 | CFLAGS_KASAN += $(call cc-option, -fsanitize-address-use-after-scope) | ||
| 36 | endif | ||
| 37 | |||
| 38 | endif # CONFIG_KASAN_GENERIC | 33 | endif # CONFIG_KASAN_GENERIC |
| 39 | 34 | ||
| 40 | ifdef CONFIG_KASAN_SW_TAGS | 35 | ifdef CONFIG_KASAN_SW_TAGS |
| @@ -37,6 +37,13 @@ parse_symbol() { · 36 unmodified lines | |||
| 37 | symbol=${symbol#\(} | 37 | symbol=${symbol#\(} |
| 38 | symbol=${symbol%\)} | 38 | symbol=${symbol%\)} |
| 39 | 39 | ||
| 40 | # Strip segment | ||
| 41 | local segment | ||
| 42 | if [[ $symbol == *:* ]] ; then | ||
| 43 | segment=${symbol%%:*}: | ||
| 44 | symbol=${symbol#*:} | ||
| 45 | fi | ||
| 46 | |||
| 40 | # Strip the symbol name so that we could look it up | 47 | # Strip the symbol name so that we could look it up |
| 41 | local name=${symbol%+*} | 48 | local name=${symbol%+*} |
| 42 | 49 | ||
| @@ -84,7 +91,7 @@ parse_symbol() { · 41 unmodified lines | |||
| 84 | code=${code//$'\n'/' '} | 91 | code=${code//$'\n'/' '} |
| 85 | 92 | ||
| 86 | # Replace old address with pretty line numbers | 93 | # Replace old address with pretty line numbers |
| 87 | symbol="$name ($code)" | 94 | symbol="$segment$name ($code)" |
| 88 | } | 95 | } |
| 89 | 96 | ||
| 90 | decode_code() { | 97 | decode_code() { |
| @@ -68,10 +68,6 @@ config GCC_PLUGIN_LATENT_ENTROPY · 67 unmodified lines | |||
| 68 | 68 | ||
| 69 | config GCC_PLUGIN_STRUCTLEAK | 69 | config GCC_PLUGIN_STRUCTLEAK |
| 70 | bool "Force initialization of variables containing userspace addresses" | 70 | bool "Force initialization of variables containing userspace addresses" |
| 71 | # Currently STRUCTLEAK inserts initialization out of live scope of | ||
| 72 | # variables from KASAN point of view. This leads to KASAN false | ||
| 73 | # positive reports. Prohibit this combination for now. | ||
| 74 | depends on !KASAN_EXTRA | ||
| 75 | help | 71 | help |
| 76 | This plugin zero-initializes any structures containing a | 72 | This plugin zero-initializes any structures containing a |
| 77 | __user attribute. This can prevent some classes of information | 73 | __user attribute. This can prevent some classes of information |