Commit 440b7895 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2022-10-20' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm 

Pull misc fixes from Andrew Morron:
 "Seventeen hotfixes, mainly for MM.

  Five are cc:stable and the remainder address post-6.0 issues"

* tag 'mm-hotfixes-stable-2022-10-20' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  nouveau: fix migrate_to_ram() for faulting page
  mm/huge_memory: do not clobber swp_entry_t during THP split
  hugetlb: fix memory leak associated with vma_lock structure
  mm/page_alloc: reduce potential fragmentation in make_alloc_exact()
  mm: /proc/pid/smaps_rollup: fix maple tree search
  mm,hugetlb: take hugetlb_lock before decrementing h->resv_huge_pages
  mm/mmap: fix MAP_FIXED address return on VMA merge
  mm/mmap.c: __vma_adjust(): suppress uninitialized var warning
  mm/mmap: undo ->mmap() when mas_preallocate() fails
  init: Kconfig: fix spelling mistake "satify" -> "satisfy"
  ocfs2: clear dinode links count in case of error
  ocfs2: fix BUG when iput after ocfs2_mknod fails
  gcov: support GCC 12.1 and newer compilers
  zsmalloc: zs_destroy_pool: add size_class NULL check
  mm/mempolicy: fix mbind_range() arguments to vma_merge()
  mailmap: update email for Qais Yousef
  mailmap: update Dan Carpenter's email address
parents ce3d90a8 97061d44

.mailmap

+3 −1
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ Christoph Hellwig <hch@lst.de> 
Colin Ian King <colin.i.king@gmail.com> <colin.king@canonical.com>

Corey Minyard <minyard@acm.org>

Damian Hobson-Garcia <dhobsong@igel.co.jp>

Dan Carpenter <error27@gmail.com> <dan.carpenter@oracle.com>

Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>

Daniel Borkmann <daniel@iogearbox.net> <danborkmann@iogearbox.net>

Daniel Borkmann <daniel@iogearbox.net> <daniel.borkmann@tik.ee.ethz.ch>
@@ -353,7 +354,8 @@ Peter Oruba <peter@oruba.de> 
Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>

Praveen BP <praveenbp@ti.com>

Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>

Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>

Qais Yousef <qyousef@layalina.io> <qais.yousef@imgtec.com>

Qais Yousef <qyousef@layalina.io> <qais.yousef@arm.com>

Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com>

Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>

Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>

drivers/gpu/drm/nouveau/nouveau_dmem.c

+1 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ static vm_fault_t nouveau_dmem_migrate_to_ram(struct vm_fault *vmf) 
		.src		= &src,

		.dst		= &dst,

		.pgmap_owner	= drm->dev,

		.fault_page	= vmf->page,

		.flags		= MIGRATE_VMA_SELECT_DEVICE_PRIVATE,

	};

fs/ocfs2/namei.c

+11 −12
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ static int ocfs2_mknod(struct user_namespace *mnt_userns, 
	handle_t *handle = NULL;

	struct ocfs2_super *osb;

	struct ocfs2_dinode *dirfe;

	struct ocfs2_dinode *fe = NULL;

	struct buffer_head *new_fe_bh = NULL;

	struct inode *inode = NULL;

	struct ocfs2_alloc_context *inode_ac = NULL;
@@ -382,6 +383,7 @@ static int ocfs2_mknod(struct user_namespace *mnt_userns, 
		goto leave;

	}



	fe = (struct ocfs2_dinode *) new_fe_bh->b_data;

	if (S_ISDIR(mode)) {

		status = ocfs2_fill_new_dir(osb, handle, dir, inode,

					    new_fe_bh, data_ac, meta_ac);
@@ -454,8 +456,11 @@ static int ocfs2_mknod(struct user_namespace *mnt_userns, 
leave:

	if (status < 0 && did_quota_inode)

		dquot_free_inode(inode);

	if (handle)

	if (handle) {

		if (status < 0 && fe)

			ocfs2_set_links_count(fe, 0);

		ocfs2_commit_trans(osb, handle);

	}



	ocfs2_inode_unlock(dir, 1);

	if (did_block_signals)
@@ -632,18 +637,9 @@ static int ocfs2_mknod_locked(struct ocfs2_super *osb, 
		return status;

	}



	status = __ocfs2_mknod_locked(dir, inode, dev, new_fe_bh,

	return __ocfs2_mknod_locked(dir, inode, dev, new_fe_bh,

				    parent_fe_bh, handle, inode_ac,

				    fe_blkno, suballoc_loc, suballoc_bit);

	if (status < 0) {

		u64 bg_blkno = ocfs2_which_suballoc_group(fe_blkno, suballoc_bit);

		int tmp = ocfs2_free_suballoc_bits(handle, inode_ac->ac_inode,

				inode_ac->ac_bh, suballoc_bit, bg_blkno, 1);

		if (tmp)

			mlog_errno(tmp);

	}



	return status;

}



static int ocfs2_mkdir(struct user_namespace *mnt_userns,
@@ -2028,8 +2024,11 @@ static int ocfs2_symlink(struct user_namespace *mnt_userns, 
					ocfs2_clusters_to_bytes(osb->sb, 1));

	if (status < 0 && did_quota_inode)

		dquot_free_inode(inode);

	if (handle)

	if (handle) {

		if (status < 0 && fe)

			ocfs2_set_links_count(fe, 0);

		ocfs2_commit_trans(osb, handle);

	}



	ocfs2_inode_unlock(dir, 1);

	if (did_block_signals)

fs/proc/task_mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -902,7 +902,7 @@ static int show_smaps_rollup(struct seq_file *m, void *v) 
		goto out_put_mm;



	hold_task_mempolicy(priv);

	vma = mas_find(&mas, 0);

	vma = mas_find(&mas, ULONG_MAX);



	if (unlikely(!vma))

		goto empty_set;

init/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ config RUST_IS_AVAILABLE 
	  This shows whether a suitable Rust toolchain is available (found).



	  Please see Documentation/rust/quick-start.rst for instructions on how

	  to satify the build requirements of Rust support.

	  to satisfy the build requirements of Rust support.



	  In particular, the Makefile target 'rustavailable' is useful to check

	  why the Rust toolchain is not being detected.