Merge branch 'akpm' (patches from Andrew)

Merge updates from Andrew Morton: "Incoming: - a small number of updates to scripts/, ocfs2 and fs/buffer.c - most of MM I still have quite a lot of material (mostly not MM) staged after linux-next due to -next dependencies. I'll send those across next week as the preprequisites get merged up" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (135 commits) mm/page_io.c: annotate refault stalls from swap_readpage mm/Kconfig: fix trivial help text punctuation mm/Kconfig: fix indentation mm/memory_hotplug.c: remove __online_page_set_limits() mm: fix typos in comments when calling __SetPageUptodate() mm: fix struct member name in function comments mm/shmem.c: cast the type of unmap_start to u64 mm: shmem: use proper gfp flags for shmem_writepage() mm/shmem.c: make array 'values' static const, makes object smaller userfaultfd: require CAP_SYS_PTRACE for UFFD_FEATURE_EVENT_FORK fs/userfaultfd.c: wp: clear VM_UFFD_MISSING or VM_UFFD_WP during userfaultfd_register() userfaultfd: wrap the common dst_vma check into an inlined function userfaultfd: remove unnecessary WARN_ON() in __mcopy_atomic_hugetlb() userfaultfd: use vma_pagesize for all huge page size calculation mm/madvise.c: use PAGE_ALIGN[ED] for range checking mm/madvise.c: replace with page_size() in madvise_inject_error() mm/mmap.c: make vma_merge() comment more easy to understand mm/hwpoison-inject: use DEFINE_DEBUGFS_ATTRIBUTE to define debugfs fops autonuma: reduce cache footprint when scanning page tables autonuma: fix watermark checking in migrate_balanced_pgdat() ...

Linus Torvalds committed 6 years ago

Commit 596cf452 parents c3bfc5d 937790695 files · +2661 −1506Browse files

Showing the changes to kernel (3 of 95 files). Show all

Unified · Split

3 files

kernel/events/uprobes.c +1 −1
kernel/fork.c +4 −0
kernel/sysctl.c +1 −1

kernel/events/uprobes.c+1−1

@@ -1457,7 +1457,7 @@ static int xol_add_vma(struct mm_struct mm, struct xol_area area) · 1456 unmodified lines
1457	1457	/* Try to map as high as possible, this is only a hint. */
1458	1458	area->vaddr = get_unmapped_area(NULL, TASK_SIZE - PAGE_SIZE,
1459	1459	PAGE_SIZE, 0, 0);
1460		− if (area->vaddr & ~PAGE_MASK) {
	1460	+ if (IS_ERR_VALUE(area->vaddr)) {
1461	1461	ret = area->vaddr;
1462	1462	goto fail;
1463	1463	}

kernel/fork.c+4−0

@@ -93,6 +93,7 @@ · 92 unmodified lines
93	93	#include <linux/livepatch.h>
94	94	#include <linux/thread_info.h>
95	95	#include <linux/stackleak.h>
	96	+#include <linux/kasan.h>
96	97
97	98	#include <asm/pgtable.h>
98	99	#include <asm/pgalloc.h>
@@ -223,6 +224,9 @@ static unsigned long alloc_thread_stack_node(struct task_struct tsk, int node) · 124 unmodified lines
223	224	if (!s)
224	225	continue;
225	226
	227	+ /* Clear the KASAN shadow of the stack. */
	228	+ kasan_unpoison_shadow(s->addr, THREAD_SIZE);
	229	+
226	230	/* Clear stale pointers from reused stack. */
227	231	memset(s->addr, 0, THREAD_SIZE);
228	232

kernel/sysctl.c+1−1

@@ -1466,7 +1466,7 @@ static struct ctl_table vm_table[] = { · 1465 unmodified lines
1466	1466	.procname = "drop_caches",
1467	1467	.data = &sysctl_drop_caches,
1468	1468	.maxlen = sizeof(int),
1469		− .mode = 0644,
	1469	+ .mode = 0200,
1470	1470	.proc_handler = drop_caches_sysctl_handler,
1471	1471	.extra1 = SYSCTL_ONE,
1472	1472	.extra2 = &four,

Merge branch 'akpm' (patches from Andrew)

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code