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

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "14 patches.

  Subsystems affected by this patch series: mm (hugetlb, kasan, gup,
  selftests, z3fold, kfence, memblock, and highmem), squashfs, ia64,
  gcov, and mailmap"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mailmap: update Andrey Konovalov's email address
  mm/highmem: fix CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP
  mm: memblock: fix section mismatch warning again
  kfence: make compatible with kmemleak
  gcov: fix clang-11+ support
  ia64: fix format strings for err_inject
  ia64: mca: allocate early mca with GFP_ATOMIC
  squashfs: fix xattr id and id lookup sanity checks
  squashfs: fix inode lookup sanity checks
  z3fold: prevent reclaim/free race for headless pages
  selftests/vm: fix out-of-tree build
  mm/mmu_notifiers: ensure range_end() is paired with range_start()
  kasan: fix per-page tags for non-page_alloc pages
  hugetlb_cgroup: fix imbalanced css_get and css_put pair for shared mappings
parents 2ba9bea2 d3e2ff28

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ Andrew Morton <akpm@linux-foundation.org> 
Andrew Murray <amurray@thegoodpenguin.co.uk> <amurray@embedded-bits.co.uk>

Andrew Murray <amurray@thegoodpenguin.co.uk> <andrew.murray@arm.com>

Andrew Vasquez <andrew.vasquez@qlogic.com>

Andrey Konovalov <andreyknvl@gmail.com> <andreyknvl@google.com>

Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>

Andrey Ryabinin <ryabinin.a.a@gmail.com> <aryabinin@virtuozzo.com>

Andy Adamson <andros@citi.umich.edu>

arch/ia64/kernel/err_inject.c

+11 −11
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ show_##name(struct device *dev, struct device_attribute *attr, \ 
		char *buf)						\

{									\

	u32 cpu=dev->id;						\

	return sprintf(buf, "%lx\n", name[cpu]);			\

	return sprintf(buf, "%llx\n", name[cpu]);			\

}



#define store(name)							\
@@ -86,9 +86,9 @@ store_call_start(struct device *dev, struct device_attribute *attr, 


#ifdef ERR_INJ_DEBUG

	printk(KERN_DEBUG "pal_mc_err_inject for cpu%d:\n", cpu);

	printk(KERN_DEBUG "err_type_info=%lx,\n", err_type_info[cpu]);

	printk(KERN_DEBUG "err_struct_info=%lx,\n", err_struct_info[cpu]);

	printk(KERN_DEBUG "err_data_buffer=%lx, %lx, %lx.\n",

	printk(KERN_DEBUG "err_type_info=%llx,\n", err_type_info[cpu]);

	printk(KERN_DEBUG "err_struct_info=%llx,\n", err_struct_info[cpu]);

	printk(KERN_DEBUG "err_data_buffer=%llx, %llx, %llx.\n",

			  err_data_buffer[cpu].data1,

			  err_data_buffer[cpu].data2,

			  err_data_buffer[cpu].data3);
@@ -117,8 +117,8 @@ store_call_start(struct device *dev, struct device_attribute *attr, 


#ifdef ERR_INJ_DEBUG

	printk(KERN_DEBUG "Returns: status=%d,\n", (int)status[cpu]);

	printk(KERN_DEBUG "capabilities=%lx,\n", capabilities[cpu]);

	printk(KERN_DEBUG "resources=%lx\n", resources[cpu]);

	printk(KERN_DEBUG "capabilities=%llx,\n", capabilities[cpu]);

	printk(KERN_DEBUG "resources=%llx\n", resources[cpu]);

#endif

	return size;

}
@@ -131,7 +131,7 @@ show_virtual_to_phys(struct device *dev, struct device_attribute *attr, 
			char *buf)

{

	unsigned int cpu=dev->id;

	return sprintf(buf, "%lx\n", phys_addr[cpu]);

	return sprintf(buf, "%llx\n", phys_addr[cpu]);

}



static ssize_t
@@ -145,7 +145,7 @@ store_virtual_to_phys(struct device *dev, struct device_attribute *attr, 
	ret = get_user_pages_fast(virt_addr, 1, FOLL_WRITE, NULL);

	if (ret<=0) {

#ifdef ERR_INJ_DEBUG

		printk("Virtual address %lx is not existing.\n",virt_addr);

		printk("Virtual address %llx is not existing.\n", virt_addr);

#endif

		return -EINVAL;

	}
@@ -163,7 +163,7 @@ show_err_data_buffer(struct device *dev, 
{

	unsigned int cpu=dev->id;



	return sprintf(buf, "%lx, %lx, %lx\n",

	return sprintf(buf, "%llx, %llx, %llx\n",

			err_data_buffer[cpu].data1,

			err_data_buffer[cpu].data2,

			err_data_buffer[cpu].data3);
@@ -178,13 +178,13 @@ store_err_data_buffer(struct device *dev, 
	int ret;



#ifdef ERR_INJ_DEBUG

	printk("write err_data_buffer=[%lx,%lx,%lx] on cpu%d\n",

	printk("write err_data_buffer=[%llx,%llx,%llx] on cpu%d\n",

		 err_data_buffer[cpu].data1,

		 err_data_buffer[cpu].data2,

		 err_data_buffer[cpu].data3,

		 cpu);

#endif

	ret=sscanf(buf, "%lx, %lx, %lx",

	ret = sscanf(buf, "%llx, %llx, %llx",

			&err_data_buffer[cpu].data1,

			&err_data_buffer[cpu].data2,

			&err_data_buffer[cpu].data3);

arch/ia64/kernel/mca.c

+1 −1
Original line number Diff line number Diff line
@@ -1824,7 +1824,7 @@ ia64_mca_cpu_init(void *cpu_data) 
			data = mca_bootmem();

			first_time = 0;

		} else

			data = (void *)__get_free_pages(GFP_KERNEL,

			data = (void *)__get_free_pages(GFP_ATOMIC,

							get_order(sz));

		if (!data)

			panic("Could not allocate MCA memory for cpu %d\n",

fs/squashfs/export.c

+6 −2
Original line number Diff line number Diff line
@@ -152,14 +152,18 @@ __le64 *squashfs_read_inode_lookup_table(struct super_block *sb, 
		start = le64_to_cpu(table[n]);

		end = le64_to_cpu(table[n + 1]);



		if (start >= end || (end - start) > SQUASHFS_METADATA_SIZE) {

		if (start >= end

		    || (end - start) >

		    (SQUASHFS_METADATA_SIZE + SQUASHFS_BLOCK_OFFSET)) {

			kfree(table);

			return ERR_PTR(-EINVAL);

		}

	}



	start = le64_to_cpu(table[indexes - 1]);

	if (start >= lookup_table_start || (lookup_table_start - start) > SQUASHFS_METADATA_SIZE) {

	if (start >= lookup_table_start ||

	    (lookup_table_start - start) >

	    (SQUASHFS_METADATA_SIZE + SQUASHFS_BLOCK_OFFSET)) {

		kfree(table);

		return ERR_PTR(-EINVAL);

	}

fs/squashfs/id.c

+4 −2
Original line number Diff line number Diff line
@@ -97,14 +97,16 @@ __le64 *squashfs_read_id_index_table(struct super_block *sb, 
		start = le64_to_cpu(table[n]);

		end = le64_to_cpu(table[n + 1]);



		if (start >= end || (end - start) > SQUASHFS_METADATA_SIZE) {

		if (start >= end || (end - start) >

				(SQUASHFS_METADATA_SIZE + SQUASHFS_BLOCK_OFFSET)) {

			kfree(table);

			return ERR_PTR(-EINVAL);

		}

	}



	start = le64_to_cpu(table[indexes - 1]);

	if (start >= id_table_start || (id_table_start - start) > SQUASHFS_METADATA_SIZE) {

	if (start >= id_table_start || (id_table_start - start) >

				(SQUASHFS_METADATA_SIZE + SQUASHFS_BLOCK_OFFSET)) {

		kfree(table);

		return ERR_PTR(-EINVAL);

	}