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

Commit 43c4f67c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "7 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm: fix false-positive WARN_ON() in truncate/invalidate for hugetlb
  kasan: support use-after-scope detection
  kasan: update kasan_global for gcc 7
  lib/debugobjects: export for use in modules
  zram: fix unbalanced idr management at hot removal
  thp: fix corner case of munlock() of PTE-mapped THPs
  mm, thp: propagation of conditional compilation in khugepaged.c
parents f513581c 5cbc198a

drivers/block/zram/zram_drv.c

+2 −1
Original line number Diff line number Diff line
@@ -1403,6 +1403,7 @@ static ssize_t hot_remove_store(struct class *class, 
	zram = idr_find(&zram_index_idr, dev_id);

	if (zram) {

		ret = zram_remove(zram);

		if (!ret)

			idr_remove(&zram_index_idr, dev_id);

	} else {

		ret = -ENODEV;

include/linux/compiler-gcc.h

+3 −1
Original line number Diff line number Diff line
@@ -263,7 +263,9 @@ 
#endif

#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP && !__CHECKER__ */



#if GCC_VERSION >= 50000

#if GCC_VERSION >= 70000

#define KASAN_ABI_VERSION 5

#elif GCC_VERSION >= 50000

#define KASAN_ABI_VERSION 4

#elif GCC_VERSION >= 40902

#define KASAN_ABI_VERSION 3

include/linux/pagemap.h

+15 −6
Original line number Diff line number Diff line
@@ -374,16 +374,13 @@ static inline struct page *read_mapping_page(struct address_space *mapping, 
}



/*

 * Get the offset in PAGE_SIZE.

 * (TODO: hugepage should have ->index in PAGE_SIZE)

 * Get index of the page with in radix-tree

 * (TODO: remove once hugetlb pages will have ->index in PAGE_SIZE)

 */

static inline pgoff_t page_to_pgoff(struct page *page)

static inline pgoff_t page_to_index(struct page *page)

{

	pgoff_t pgoff;



	if (unlikely(PageHeadHuge(page)))

		return page->index << compound_order(page);



	if (likely(!PageTransTail(page)))

		return page->index;
@@ -396,6 +393,18 @@ static inline pgoff_t page_to_pgoff(struct page *page) 
	return pgoff;

}



/*

 * Get the offset in PAGE_SIZE.

 * (TODO: hugepage should have ->index in PAGE_SIZE)

 */

static inline pgoff_t page_to_pgoff(struct page *page)

{

	if (unlikely(PageHeadHuge(page)))

		return page->index << compound_order(page);



	return page_to_index(page);

}



/*

 * Return byte-offset into filesystem object for page.

 */

lib/debugobjects.c

+8 −0
Original line number Diff line number Diff line
@@ -362,6 +362,7 @@ void debug_object_init(void *addr, struct debug_obj_descr *descr) 


	__debug_object_init(addr, descr, 0);

}

EXPORT_SYMBOL_GPL(debug_object_init);



/**

 * debug_object_init_on_stack - debug checks when an object on stack is
@@ -376,6 +377,7 @@ void debug_object_init_on_stack(void *addr, struct debug_obj_descr *descr) 


	__debug_object_init(addr, descr, 1);

}

EXPORT_SYMBOL_GPL(debug_object_init_on_stack);



/**

 * debug_object_activate - debug checks when an object is activated
@@ -449,6 +451,7 @@ int debug_object_activate(void *addr, struct debug_obj_descr *descr) 
	}

	return 0;

}

EXPORT_SYMBOL_GPL(debug_object_activate);



/**

 * debug_object_deactivate - debug checks when an object is deactivated
@@ -496,6 +499,7 @@ void debug_object_deactivate(void *addr, struct debug_obj_descr *descr) 


	raw_spin_unlock_irqrestore(&db->lock, flags);

}

EXPORT_SYMBOL_GPL(debug_object_deactivate);



/**

 * debug_object_destroy - debug checks when an object is destroyed
@@ -542,6 +546,7 @@ void debug_object_destroy(void *addr, struct debug_obj_descr *descr) 
out_unlock:

	raw_spin_unlock_irqrestore(&db->lock, flags);

}

EXPORT_SYMBOL_GPL(debug_object_destroy);



/**

 * debug_object_free - debug checks when an object is freed
@@ -582,6 +587,7 @@ void debug_object_free(void *addr, struct debug_obj_descr *descr) 
out_unlock:

	raw_spin_unlock_irqrestore(&db->lock, flags);

}

EXPORT_SYMBOL_GPL(debug_object_free);



/**

 * debug_object_assert_init - debug checks when object should be init-ed
@@ -626,6 +632,7 @@ void debug_object_assert_init(void *addr, struct debug_obj_descr *descr) 


	raw_spin_unlock_irqrestore(&db->lock, flags);

}

EXPORT_SYMBOL_GPL(debug_object_assert_init);



/**

 * debug_object_active_state - debug checks object usage state machine
@@ -673,6 +680,7 @@ debug_object_active_state(void *addr, struct debug_obj_descr *descr, 


	raw_spin_unlock_irqrestore(&db->lock, flags);

}

EXPORT_SYMBOL_GPL(debug_object_active_state);



#ifdef CONFIG_DEBUG_OBJECTS_FREE

static void __debug_check_no_obj_freed(const void *address, unsigned long size)

lib/test_kasan.c

+29 −0
Original line number Diff line number Diff line
@@ -20,6 +20,11 @@ 
#include <linux/uaccess.h>

#include <linux/module.h>



/*

 * Note: test functions are marked noinline so that their names appear in

 * reports.

 */



static noinline void __init kmalloc_oob_right(void)

{

	char *ptr;
@@ -411,6 +416,29 @@ static noinline void __init copy_user_test(void) 
	kfree(kmem);

}



static noinline void __init use_after_scope_test(void)

{

	volatile char *volatile p;



	pr_info("use-after-scope on int\n");

	{

		int local = 0;



		p = (char *)&local;

	}

	p[0] = 1;

	p[3] = 1;



	pr_info("use-after-scope on array\n");

	{

		char local[1024] = {0};



		p = local;

	}

	p[0] = 1;

	p[1023] = 1;

}



static int __init kmalloc_tests_init(void)

{

	kmalloc_oob_right();
@@ -436,6 +464,7 @@ static int __init kmalloc_tests_init(void) 
	kasan_global_oob();

	ksize_unpoisons_memory();

	copy_user_test();

	use_after_scope_test();

	return -EAGAIN;

}