Commit f67d6b26 authored by Andrew Morton's avatar Andrew Morton
Browse files

Merge branch 'mm-hotfixes-stable' into mm-stable 

To pick up depended-upon changes
parents 223ec6ab ce4d9a1e

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ Aleksey Gorelov <aleksey_gorelov@phoenix.com> 
Alexander Lobakin <alobakin@pm.me> <alobakin@dlink.ru>

Alexander Lobakin <alobakin@pm.me> <alobakin@marvell.com>

Alexander Lobakin <alobakin@pm.me> <bloodyreaper@yandex.ru>

Alexander Mikhalitsyn <alexander@mihalicyn.com> <alexander.mikhalitsyn@virtuozzo.com>

Alexander Mikhalitsyn <alexander@mihalicyn.com> <aleksandr.mikhalitsyn@canonical.com>

Alexandre Belloni <alexandre.belloni@bootlin.com> <alexandre.belloni@free-electrons.com>

Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>

Alexei Starovoitov <ast@kernel.org> <ast@fb.com>

drivers/of/of_reserved_mem.c

+2 −1
Original line number Diff line number Diff line
@@ -48,9 +48,10 @@ static int __init early_init_dt_alloc_reserved_memory_arch(phys_addr_t size, 
		err = memblock_mark_nomap(base, size);

		if (err)

			memblock_phys_free(base, size);

		kmemleak_ignore_phys(base);

	}



	kmemleak_ignore_phys(base);



	return err;

}

fs/aio.c

+4 −0
Original line number Diff line number Diff line
@@ -361,6 +361,9 @@ static int aio_ring_mremap(struct vm_area_struct *vma) 
	spin_lock(&mm->ioctx_lock);

	rcu_read_lock();

	table = rcu_dereference(mm->ioctx_table);

	if (!table)

		goto out_unlock;



	for (i = 0; i < table->nr; i++) {

		struct kioctx *ctx;
@@ -374,6 +377,7 @@ static int aio_ring_mremap(struct vm_area_struct *vma) 
		}

	}



out_unlock:

	rcu_read_unlock();

	spin_unlock(&mm->ioctx_lock);

	return res;

fs/dax.c

+3 −2
Original line number Diff line number Diff line
@@ -1271,8 +1271,9 @@ static s64 dax_unshare_iter(struct iomap_iter *iter) 
	if (ret < 0)

		goto out_unlock;



	ret = copy_mc_to_kernel(daddr, saddr, length);

	if (ret)

	if (copy_mc_to_kernel(daddr, saddr, length) == 0)

		ret = length;

	else

		ret = -EIO;



out_unlock:

fs/squashfs/xattr_id.c

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ __le64 *squashfs_read_xattr_id_table(struct super_block *sb, u64 table_start, 
	/* Sanity check values */



	/* there is always at least one xattr id */

	if (*xattr_ids <= 0)

	if (*xattr_ids == 0)

		return ERR_PTR(-EINVAL);



	len = SQUASHFS_XATTR_BLOCK_BYTES(*xattr_ids);