Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 380173ff authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge fixes from Andrew Morton:
 "13 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  dma-mapping: avoid oops when parameter cpu_addr is null
  mm/hugetlb: use EOPNOTSUPP in hugetlb sysctl handlers
  memremap: check pfn validity before passing to pfn_to_page()
  mm, thp: fix migration of PTE-mapped transparent huge pages
  dax: check return value of dax_radix_entry()
  ocfs2: fix return value from ocfs2_page_mkwrite()
  arm64: kasan: clear stale stack poison
  sched/kasan: remove stale KASAN poison after hotplug
  kasan: add functions to clear stack poison
  mm: fix mixed zone detection in devm_memremap_pages
  list: kill list_force_poison()
  mm: __delete_from_page_cache show Bad page if mapped
  mm/hugetlb: hugetlb_no_page: rate-limit warning message
parents 2f0d94ea d6b7eaeb

arch/arm64/kernel/sleep.S

+4 −0
Original line number Diff line number Diff line
@@ -145,6 +145,10 @@ ENTRY(cpu_resume_mmu) 
ENDPROC(cpu_resume_mmu)

	.popsection

cpu_resume_after_mmu:

#ifdef CONFIG_KASAN

	mov	x0, sp

	bl	kasan_unpoison_remaining_stack

#endif

	mov	x0, #0			// return zero on success

	ldp	x19, x20, [sp, #16]

	ldp	x21, x22, [sp, #32]

fs/dax.c

+8 −1
Original line number Diff line number Diff line
@@ -1056,6 +1056,7 @@ EXPORT_SYMBOL_GPL(dax_pmd_fault); 
int dax_pfn_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)

{

	struct file *file = vma->vm_file;

	int error;



	/*

	 * We pass NO_SECTOR to dax_radix_entry() because we expect that a
@@ -1065,7 +1066,13 @@ int dax_pfn_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) 
	 * saves us from having to make a call to get_block() here to look

	 * up the sector.

	 */

	dax_radix_entry(file->f_mapping, vmf->pgoff, NO_SECTOR, false, true);

	error = dax_radix_entry(file->f_mapping, vmf->pgoff, NO_SECTOR, false,

			true);



	if (error == -ENOMEM)

		return VM_FAULT_OOM;

	if (error)

		return VM_FAULT_SIGBUS;

	return VM_FAULT_NOPAGE;

}

EXPORT_SYMBOL_GPL(dax_pfn_mkwrite);

fs/ocfs2/mmap.c

+4 −0
Original line number Diff line number Diff line
@@ -147,6 +147,10 @@ static int ocfs2_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) 
	ret = ocfs2_inode_lock(inode, &di_bh, 1);

	if (ret < 0) {

		mlog_errno(ret);

		if (ret == -ENOMEM)

			ret = VM_FAULT_OOM;

		else

			ret = VM_FAULT_SIGBUS;

		goto out;

	}

include/linux/dma-mapping.h

+1 −1
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ static inline void dma_free_attrs(struct device *dev, size_t size, 
	if (dma_release_from_coherent(dev, get_order(size), cpu_addr))

		return;



	if (!ops->free)

	if (!ops->free || !cpu_addr)

		return;



	debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);

include/linux/kasan.h

+5 −1
Original line number Diff line number Diff line 
#ifndef _LINUX_KASAN_H

#define _LINUX_KASAN_H



#include <linux/sched.h>

#include <linux/types.h>



struct kmem_cache;
@@ -13,7 +14,6 @@ struct vm_struct; 


#include <asm/kasan.h>

#include <asm/pgtable.h>

#include <linux/sched.h>



extern unsigned char kasan_zero_page[PAGE_SIZE];

extern pte_t kasan_zero_pte[PTRS_PER_PTE];
@@ -43,6 +43,8 @@ static inline void kasan_disable_current(void) 


void kasan_unpoison_shadow(const void *address, size_t size);



void kasan_unpoison_task_stack(struct task_struct *task);



void kasan_alloc_pages(struct page *page, unsigned int order);

void kasan_free_pages(struct page *page, unsigned int order);
@@ -66,6 +68,8 @@ void kasan_free_shadow(const struct vm_struct *vm); 


static inline void kasan_unpoison_shadow(const void *address, size_t size) {}



static inline void kasan_unpoison_task_stack(struct task_struct *task) {}



static inline void kasan_enable_current(void) {}

static inline void kasan_disable_current(void) {}