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

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "19 patches.

  Subsystems affected by this patch series: mm (userfaultfd, migration,
  memblock, mempolicy, slub, secretmem, and thp), ocfs2, binfmt, vfs,
  and misc"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mailmap: add Andrej Shadura
  mm/thp: decrease nr_thps in file's mapping on THP split
  mm/secretmem: fix NULL page->mapping dereference in page_is_secretmem()
  vfs: check fd has read access in kernel_read_file_from_fd()
  elfcore: correct reference to CONFIG_UML
  mm, slub: fix incorrect memcg slab count for bulk free
  mm, slub: fix potential use-after-free in slab_debugfs_fops
  mm, slub: fix potential memoryleak in kmem_cache_open()
  mm, slub: fix mismatch between reconstructed freelist depth and cnt
  mm, slub: fix two bugs in slab_debug_trace_open()
  mm/mempolicy: do not allow illegal MPOL_F_NUMA_BALANCING | MPOL_LOCAL in mbind()
  memblock: check memory total_size
  ocfs2: mount fails with buffer overflow in strlen
  ocfs2: fix data corruption after conversion from inline format
  mm/migrate: fix CPUHP state to update node demotion order
  mm/migrate: add CPU hotplug to demotion #ifdef
  mm/migrate: optimize hotplug-time demotion order updates
  userfaultfd: fix a race between writeprotect and exit_mmap()
  mm/userfaultfd: selftests: fix memory corruption with thp enabled
parents 519d8195 362d5dfc

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ Al Viro <viro@zenIV.linux.org.uk> 
Andi Kleen <ak@linux.intel.com> <ak@suse.de>

Andi Shyti <andi@etezian.org> <andi.shyti@samsung.com>

Andreas Herrmann <aherrman@de.ibm.com>

Andrej Shadura <andrew.shadura@collabora.co.uk>

Andrej Shadura <andrew@shadura.me> <andrew@beldisplaytech.com>

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>

fs/kernel_read_file.c

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ int kernel_read_file_from_fd(int fd, loff_t offset, void **buf, 
	struct fd f = fdget(fd);

	int ret = -EBADF;



	if (!f.file)

	if (!f.file || !(f.file->f_mode & FMODE_READ))

		goto out;



	ret = kernel_read_file(f.file, offset, buf, buf_size, file_size, id);

fs/ocfs2/alloc.c

+12 −34
Original line number Diff line number Diff line
@@ -7045,7 +7045,7 @@ void ocfs2_set_inode_data_inline(struct inode *inode, struct ocfs2_dinode *di) 
int ocfs2_convert_inline_data_to_extents(struct inode *inode,

					 struct buffer_head *di_bh)

{

	int ret, i, has_data, num_pages = 0;

	int ret, has_data, num_pages = 0;

	int need_free = 0;

	u32 bit_off, num;

	handle_t *handle;
@@ -7054,26 +7054,17 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode, 
	struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);

	struct ocfs2_dinode *di = (struct ocfs2_dinode *)di_bh->b_data;

	struct ocfs2_alloc_context *data_ac = NULL;

	struct page **pages = NULL;

	loff_t end = osb->s_clustersize;

	struct page *page = NULL;

	struct ocfs2_extent_tree et;

	int did_quota = 0;



	has_data = i_size_read(inode) ? 1 : 0;



	if (has_data) {

		pages = kcalloc(ocfs2_pages_per_cluster(osb->sb),

				sizeof(struct page *), GFP_NOFS);

		if (pages == NULL) {

			ret = -ENOMEM;

			mlog_errno(ret);

			return ret;

		}



		ret = ocfs2_reserve_clusters(osb, 1, &data_ac);

		if (ret) {

			mlog_errno(ret);

			goto free_pages;

			goto out;

		}

	}
@@ -7093,7 +7084,8 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode, 
	}



	if (has_data) {

		unsigned int page_end;

		unsigned int page_end = min_t(unsigned, PAGE_SIZE,

							osb->s_clustersize);

		u64 phys;



		ret = dquot_alloc_space_nodirty(inode,
@@ -7117,15 +7109,8 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode, 
		 */

		block = phys = ocfs2_clusters_to_blocks(inode->i_sb, bit_off);



		/*

		 * Non sparse file systems zero on extend, so no need

		 * to do that now.

		 */

		if (!ocfs2_sparse_alloc(osb) &&

		    PAGE_SIZE < osb->s_clustersize)

			end = PAGE_SIZE;



		ret = ocfs2_grab_eof_pages(inode, 0, end, pages, &num_pages);

		ret = ocfs2_grab_eof_pages(inode, 0, page_end, &page,

					   &num_pages);

		if (ret) {

			mlog_errno(ret);

			need_free = 1;
@@ -7136,20 +7121,15 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode, 
		 * This should populate the 1st page for us and mark

		 * it up to date.

		 */

		ret = ocfs2_read_inline_data(inode, pages[0], di_bh);

		ret = ocfs2_read_inline_data(inode, page, di_bh);

		if (ret) {

			mlog_errno(ret);

			need_free = 1;

			goto out_unlock;

		}



		page_end = PAGE_SIZE;

		if (PAGE_SIZE > osb->s_clustersize)

			page_end = osb->s_clustersize;



		for (i = 0; i < num_pages; i++)

			ocfs2_map_and_dirty_page(inode, handle, 0, page_end,

						 pages[i], i > 0, &phys);

		ocfs2_map_and_dirty_page(inode, handle, 0, page_end, page, 0,

					 &phys);

	}



	spin_lock(&oi->ip_lock);
@@ -7180,8 +7160,8 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode, 
	}



out_unlock:

	if (pages)

		ocfs2_unlock_and_free_pages(pages, num_pages);

	if (page)

		ocfs2_unlock_and_free_pages(&page, num_pages);



out_commit:

	if (ret < 0 && did_quota)
@@ -7205,8 +7185,6 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode, 
out:

	if (data_ac)

		ocfs2_free_alloc_context(data_ac);

free_pages:

	kfree(pages);

	return ret;

}

fs/ocfs2/super.c

+10 −4
Original line number Diff line number Diff line
@@ -2167,11 +2167,17 @@ static int ocfs2_initialize_super(struct super_block *sb, 
	}



	if (ocfs2_clusterinfo_valid(osb)) {

		/*

		 * ci_stack and ci_cluster in ocfs2_cluster_info may not be null

		 * terminated, so make sure no overflow happens here by using

		 * memcpy. Destination strings will always be null terminated

		 * because osb is allocated using kzalloc.

		 */

		osb->osb_stackflags =

			OCFS2_RAW_SB(di)->s_cluster_info.ci_stackflags;

		strlcpy(osb->osb_cluster_stack,

		memcpy(osb->osb_cluster_stack,

		       OCFS2_RAW_SB(di)->s_cluster_info.ci_stack,

		       OCFS2_STACK_LABEL_LEN + 1);

		       OCFS2_STACK_LABEL_LEN);

		if (strlen(osb->osb_cluster_stack) != OCFS2_STACK_LABEL_LEN) {

			mlog(ML_ERROR,

			     "couldn't mount because of an invalid "
@@ -2180,9 +2186,9 @@ static int ocfs2_initialize_super(struct super_block *sb, 
			status = -EINVAL;

			goto bail;

		}

		strlcpy(osb->osb_cluster_name,

		memcpy(osb->osb_cluster_name,

			OCFS2_RAW_SB(di)->s_cluster_info.ci_cluster,

			OCFS2_CLUSTER_NAME_LEN + 1);

			OCFS2_CLUSTER_NAME_LEN);

	} else {

		/* The empty string is identical with classic tools that

		 * don't know about s_cluster_info. */

fs/userfaultfd.c

+9 −3
Original line number Diff line number Diff line
@@ -1827,9 +1827,15 @@ static int userfaultfd_writeprotect(struct userfaultfd_ctx *ctx, 
	if (mode_wp && mode_dontwake)

		return -EINVAL;



	if (mmget_not_zero(ctx->mm)) {

		ret = mwriteprotect_range(ctx->mm, uffdio_wp.range.start,

					  uffdio_wp.range.len, mode_wp,

					  &ctx->mmap_changing);

		mmput(ctx->mm);

	} else {

		return -ESRCH;

	}



	if (ret)

		return ret;