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

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "13 patches.

  Subsystems affected by this patch series: resource, squashfs, hfsplus,
  modprobe, and mm (hugetlb, slub, userfaultfd, ksm, pagealloc, kasan,
  pagemap, and ioremap)"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm/ioremap: fix iomap_max_page_shift
  docs: admin-guide: update description for kernel.modprobe sysctl
  hfsplus: prevent corruption in shrinking truncate
  mm/filemap: fix readahead return types
  kasan: fix unit tests with CONFIG_UBSAN_LOCAL_BOUNDS enabled
  mm: fix struct page layout on 32-bit systems
  ksm: revert "use GET_KSM_PAGE_NOLOCK to get ksm page in remove_rmap_item_from_tree()"
  userfaultfd: release page in error path to avoid BUG_ON
  squashfs: fix divide error in calculate_skip()
  kernel/resource: fix return code check in __request_free_mem_region
  mm, slub: move slub_debug static key enabling outside slab_mutex
  mm/hugetlb: fix cow where page writtable in child
  mm/hugetlb: fix F_SEAL_FUTURE_WRITE
parents f36edc55 86d0c164

Documentation/admin-guide/sysctl/kernel.rst

+5 −4
Original line number Diff line number Diff line
@@ -483,10 +483,11 @@ modprobe 
========



The full path to the usermode helper for autoloading kernel modules,

by default "/sbin/modprobe".  This binary is executed when the kernel

requests a module.  For example, if userspace passes an unknown

filesystem type to mount(), then the kernel will automatically request

the corresponding filesystem module by executing this usermode helper.

by default ``CONFIG_MODPROBE_PATH``, which in turn defaults to

"/sbin/modprobe".  This binary is executed when the kernel requests a

module.  For example, if userspace passes an unknown filesystem type

to mount(), then the kernel will automatically request the

corresponding filesystem module by executing this usermode helper.

This usermode helper should insert the needed module into the kernel.



This sysctl only affects module autoloading.  It has no effect on the

fs/hfsplus/extents.c

+4 −3
Original line number Diff line number Diff line
@@ -598,13 +598,15 @@ void hfsplus_file_truncate(struct inode *inode) 
		res = __hfsplus_ext_cache_extent(&fd, inode, alloc_cnt);

		if (res)

			break;

		hfs_brec_remove(&fd);



		mutex_unlock(&fd.tree->tree_lock);

		start = hip->cached_start;

		if (blk_cnt <= start)

			hfs_brec_remove(&fd);

		mutex_unlock(&fd.tree->tree_lock);

		hfsplus_free_extents(sb, hip->cached_extents,

				     alloc_cnt - start, alloc_cnt - blk_cnt);

		hfsplus_dump_extent(hip->cached_extents);

		mutex_lock(&fd.tree->tree_lock);

		if (blk_cnt > start) {

			hip->extent_state |= HFSPLUS_EXT_DIRTY;

			break;
@@ -612,7 +614,6 @@ void hfsplus_file_truncate(struct inode *inode) 
		alloc_cnt = start;

		hip->cached_start = hip->cached_blocks = 0;

		hip->extent_state &= ~(HFSPLUS_EXT_DIRTY | HFSPLUS_EXT_NEW);

		mutex_lock(&fd.tree->tree_lock);

	}

	hfs_find_exit(&fd);

fs/hugetlbfs/inode.c

+5 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ static void huge_pagevec_release(struct pagevec *pvec) 
static int hugetlbfs_file_mmap(struct file *file, struct vm_area_struct *vma)

{

	struct inode *inode = file_inode(file);

	struct hugetlbfs_inode_info *info = HUGETLBFS_I(inode);

	loff_t len, vma_len;

	int ret;

	struct hstate *h = hstate_file(file);
@@ -146,6 +147,10 @@ static int hugetlbfs_file_mmap(struct file *file, struct vm_area_struct *vma) 
	vma->vm_flags |= VM_HUGETLB | VM_DONTEXPAND;

	vma->vm_ops = &hugetlb_vm_ops;



	ret = seal_check_future_write(info->seals, vma);

	if (ret)

		return ret;



	/*

	 * page based offset in vm_pgoff could be sufficiently large to

	 * overflow a loff_t when converted to byte offset.  This can

fs/iomap/buffered-io.c

+2 −2
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ void iomap_readahead(struct readahead_control *rac, const struct iomap_ops *ops) 
{

	struct inode *inode = rac->mapping->host;

	loff_t pos = readahead_pos(rac);

	loff_t length = readahead_length(rac);

	size_t length = readahead_length(rac);

	struct iomap_readpage_ctx ctx = {

		.rac	= rac,

	};
@@ -402,7 +402,7 @@ void iomap_readahead(struct readahead_control *rac, const struct iomap_ops *ops) 
	trace_iomap_readahead(inode, readahead_count(rac));



	while (length > 0) {

		loff_t ret = iomap_apply(inode, pos, length, 0, ops,

		ssize_t ret = iomap_apply(inode, pos, length, 0, ops,

				&ctx, iomap_readahead_actor);

		if (ret <= 0) {

			WARN_ON_ONCE(ret == 0);

fs/squashfs/file.c

+3 −3
Original line number Diff line number Diff line
@@ -211,11 +211,11 @@ static long long read_indexes(struct super_block *sb, int n, 
 * If the skip factor is limited in this way then the file will use multiple

 * slots.

 */

static inline int calculate_skip(int blocks)

static inline int calculate_skip(u64 blocks)

{

	int skip = blocks / ((SQUASHFS_META_ENTRIES + 1)

	u64 skip = blocks / ((SQUASHFS_META_ENTRIES + 1)

		 * SQUASHFS_META_INDEXES);

	return min(SQUASHFS_CACHED_BLKS - 1, skip + 1);

	return min((u64) SQUASHFS_CACHED_BLKS - 1, skip + 1);

}