--- mm/mlock.c

+++ mm/mlock.c

@@ -138,6 +138,13 @@ void munlock_vma_page(struct page *page)

}

}

+static inline int stack_guard_page(struct vm_area_struct *vma, unsigned long addr)

+{

+ return (vma->vm_flags & VM_GROWSDOWN) &&

+ (vma->vm_start == addr) &&

+ !vma_stack_continue(vma->vm_prev, addr);

+}

+

/**

* __mlock_vma_pages_range() - mlock a range of pages in the vma.

* @vma: target vma

@@ -170,6 +177,12 @@ static long __mlock_vma_pages_range(stru

if (vma->vm_flags & VM_WRITE)

gup_flags |= FOLL_WRITE;

+ /* We don't try to access the guard page of a stack vma */

+ if (stack_guard_page(vma, start)) {

+ addr += PAGE_SIZE;

+ nr_pages--;

+ }

+

while (nr_pages > 0) {

int i;