Commit dfa377c3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "7 patches.

  Subsystems affected by this patch series: mm (kasan, mm/slub,
  mm/madvise, and memcg), and lib"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  lib: use PFN_PHYS() in devmem_is_allowed()
  mm/memcg: fix incorrect flushing of lruvec data in obj_stock
  mm/madvise: report SIGBUS as -EFAULT for MADV_POPULATE_(READ|WRITE)
  mm: slub: fix slub_debug disabling for list of slabs
  slub: fix kmalloc_pagealloc_invalid_free unit test
  kasan, slub: reset tag when printing address
  kasan, kmemleak: reset tags when scanning block
parents 27b2eaa1 854f3264

lib/devmem_is_allowed.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
 */

int devmem_is_allowed(unsigned long pfn)

{

	if (iomem_is_exclusive(pfn << PAGE_SHIFT))

	if (iomem_is_exclusive(PFN_PHYS(pfn)))

		return 0;

	if (!page_is_ram(pfn))

		return 1;

mm/gup.c

+5 −2
Original line number Diff line number Diff line
@@ -1558,9 +1558,12 @@ long faultin_vma_page_range(struct vm_area_struct *vma, unsigned long start, 
		gup_flags |= FOLL_WRITE;



	/*

	 * See check_vma_flags(): Will return -EFAULT on incompatible mappings

	 * or with insufficient permissions.

	 * We want to report -EINVAL instead of -EFAULT for any permission

	 * problems or incompatible mappings.

	 */

	if (check_vma_flags(vma, gup_flags))

		return -EINVAL;



	return __get_user_pages(mm, start, nr_pages, gup_flags,

				NULL, NULL, locked);

}

mm/kmemleak.c

+3 −3
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static void hex_dump_object(struct seq_file *seq, 
	warn_or_seq_printf(seq, "  hex dump (first %zu bytes):\n", len);

	kasan_disable_current();

	warn_or_seq_hex_dump(seq, DUMP_PREFIX_NONE, HEX_ROW_SIZE,

			     HEX_GROUP_SIZE, ptr, len, HEX_ASCII);

			     HEX_GROUP_SIZE, kasan_reset_tag((void *)ptr), len, HEX_ASCII);

	kasan_enable_current();

}
@@ -1171,7 +1171,7 @@ static bool update_checksum(struct kmemleak_object *object) 


	kasan_disable_current();

	kcsan_disable_current();

	object->checksum = crc32(0, (void *)object->pointer, object->size);

	object->checksum = crc32(0, kasan_reset_tag((void *)object->pointer), object->size);

	kasan_enable_current();

	kcsan_enable_current();
@@ -1246,7 +1246,7 @@ static void scan_block(void *_start, void *_end, 
			break;



		kasan_disable_current();

		pointer = *ptr;

		pointer = *(unsigned long *)kasan_reset_tag((void *)ptr);

		kasan_enable_current();



		untagged_ptr = (unsigned long)kasan_reset_tag((void *)pointer);

mm/madvise.c

+3 −1
Original line number Diff line number Diff line
@@ -862,10 +862,12 @@ static long madvise_populate(struct vm_area_struct *vma, 
			switch (pages) {

			case -EINTR:

				return -EINTR;

			case -EFAULT: /* Incompatible mappings / permissions. */

			case -EINVAL: /* Incompatible mappings / permissions. */

				return -EINVAL;

			case -EHWPOISON:

				return -EHWPOISON;

			case -EFAULT: /* VM_FAULT_SIGBUS or VM_FAULT_SIGSEGV */

				return -EFAULT;

			default:

				pr_warn_once("%s: unhandled return value: %ld\n",

					     __func__, pages);

mm/memcontrol.c

+4 −2
Original line number Diff line number Diff line
@@ -3106,13 +3106,15 @@ void mod_objcg_state(struct obj_cgroup *objcg, struct pglist_data *pgdat, 
		stock->cached_pgdat = pgdat;

	} else if (stock->cached_pgdat != pgdat) {

		/* Flush the existing cached vmstat data */

		struct pglist_data *oldpg = stock->cached_pgdat;



		if (stock->nr_slab_reclaimable_b) {

			mod_objcg_mlstate(objcg, pgdat, NR_SLAB_RECLAIMABLE_B,

			mod_objcg_mlstate(objcg, oldpg, NR_SLAB_RECLAIMABLE_B,

					  stock->nr_slab_reclaimable_b);

			stock->nr_slab_reclaimable_b = 0;

		}

		if (stock->nr_slab_unreclaimable_b) {

			mod_objcg_mlstate(objcg, pgdat, NR_SLAB_UNRECLAIMABLE_B,

			mod_objcg_mlstate(objcg, oldpg, NR_SLAB_UNRECLAIMABLE_B,

					  stock->nr_slab_unreclaimable_b);

			stock->nr_slab_unreclaimable_b = 0;

		}