Commit 553c89ec authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2024-12-07-22-39' of... 

Merge tag 'mm-hotfixes-stable-2024-12-07-22-39' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull misc fixes from Andrew Morton:
 "24 hotfixes.  17 are cc:stable.  15 are MM and 9 are non-MM.

  The usual bunch of singletons - please see the relevant changelogs for
  details"

* tag 'mm-hotfixes-stable-2024-12-07-22-39' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: (24 commits)
  iio: magnetometer: yas530: use signed integer type for clamp limits
  sched/numa: fix memory leak due to the overwritten vma->numab_state
  mm/damon: fix order of arguments in damos_before_apply tracepoint
  lib: stackinit: hide never-taken branch from compiler
  mm/filemap: don't call folio_test_locked() without a reference in next_uptodate_folio()
  scatterlist: fix incorrect func name in kernel-doc
  mm: correct typo in MMAP_STATE() macro
  mm: respect mmap hint address when aligning for THP
  mm: memcg: declare do_memsw_account inline
  mm/codetag: swap tags when migrate pages
  ocfs2: update seq_file index in ocfs2_dlm_seq_next
  stackdepot: fix stack_depot_save_flags() in NMI context
  mm: open-code page_folio() in dump_page()
  mm: open-code PageTail in folio_flags() and const_folio_flags()
  mm: fix vrealloc()'s KASAN poisoning logic
  Revert "readahead: properly shorten readahead when falling back to do_page_cache_ra()"
  selftests/damon: add _damon_sysfs.py to TEST_FILES
  selftest: hugetlb_dio: fix test naming
  ocfs2: free inode when ocfs2_get_init_inode() fails
  nilfs2: fix potential out-of-bounds memory access in nilfs_find_entry()
  ...
parents 62b5a469 f1ee5483

drivers/iio/magnetometer/yamaha-yas530.c

+7 −6
Original line number Diff line number Diff line
@@ -372,6 +372,7 @@ static int yas537_measure(struct yas5xx *yas5xx, u16 *t, u16 *x, u16 *y1, u16 *y 
	u8 data[8];

	u16 xy1y2[3];

	s32 h[3], s[3];

	int half_range = BIT(13);

	int i, ret;



	mutex_lock(&yas5xx->lock);
@@ -406,13 +407,13 @@ static int yas537_measure(struct yas5xx *yas5xx, u16 *t, u16 *x, u16 *y1, u16 *y 
	/* The second version of YAS537 needs to include calibration coefficients */

	if (yas5xx->version == YAS537_VERSION_1) {

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

			s[i] = xy1y2[i] - BIT(13);

		h[0] = (c->k *   (128 * s[0] + c->a2 * s[1] + c->a3 * s[2])) / BIT(13);

		h[1] = (c->k * (c->a4 * s[0] + c->a5 * s[1] + c->a6 * s[2])) / BIT(13);

		h[2] = (c->k * (c->a7 * s[0] + c->a8 * s[1] + c->a9 * s[2])) / BIT(13);

			s[i] = xy1y2[i] - half_range;

		h[0] = (c->k *   (128 * s[0] + c->a2 * s[1] + c->a3 * s[2])) / half_range;

		h[1] = (c->k * (c->a4 * s[0] + c->a5 * s[1] + c->a6 * s[2])) / half_range;

		h[2] = (c->k * (c->a7 * s[0] + c->a8 * s[1] + c->a9 * s[2])) / half_range;

		for (i = 0; i < 3; i++) {

			clamp_val(h[i], -BIT(13), BIT(13) - 1);

			xy1y2[i] = h[i] + BIT(13);

			h[i] = clamp(h[i], -half_range, half_range - 1);

			xy1y2[i] = h[i] + half_range;

		}

	}

fs/nilfs2/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static inline unsigned int nilfs_chunk_size(struct inode *inode) 
 */

static unsigned int nilfs_last_byte(struct inode *inode, unsigned long page_nr)

{

	unsigned int last_byte = inode->i_size;

	u64 last_byte = inode->i_size;



	last_byte -= page_nr << PAGE_SHIFT;

	if (last_byte > PAGE_SIZE)

fs/ocfs2/dlmglue.c

+1 −0
Original line number Diff line number Diff line
@@ -3110,6 +3110,7 @@ static void *ocfs2_dlm_seq_next(struct seq_file *m, void *v, loff_t *pos) 
	struct ocfs2_lock_res *iter = v;

	struct ocfs2_lock_res *dummy = &priv->p_iter_res;



	(*pos)++;

	spin_lock(&ocfs2_dlm_tracking_lock);

	iter = ocfs2_dlm_next_res(iter, priv);

	list_del_init(&dummy->l_debug_list);

fs/ocfs2/namei.c

+3 −1
Original line number Diff line number Diff line
@@ -200,8 +200,10 @@ static struct inode *ocfs2_get_init_inode(struct inode *dir, umode_t mode) 
	mode = mode_strip_sgid(&nop_mnt_idmap, dir, mode);

	inode_init_owner(&nop_mnt_idmap, inode, dir, mode);

	status = dquot_initialize(inode);

	if (status)

	if (status) {

		iput(inode);

		return ERR_PTR(status);

	}



	return inode;

}

fs/proc/vmcore.c

+28 −28
Original line number Diff line number Diff line
@@ -414,6 +414,34 @@ static ssize_t read_vmcore(struct kiocb *iocb, struct iov_iter *iter) 
	return __read_vmcore(iter, &iocb->ki_pos);

}



/**

 * vmcore_alloc_buf - allocate buffer in vmalloc memory

 * @size: size of buffer

 *

 * If CONFIG_MMU is defined, use vmalloc_user() to allow users to mmap

 * the buffer to user-space by means of remap_vmalloc_range().

 *

 * If CONFIG_MMU is not defined, use vzalloc() since mmap_vmcore() is

 * disabled and there's no need to allow users to mmap the buffer.

 */

static inline char *vmcore_alloc_buf(size_t size)

{

#ifdef CONFIG_MMU

	return vmalloc_user(size);

#else

	return vzalloc(size);

#endif

}



/*

 * Disable mmap_vmcore() if CONFIG_MMU is not defined. MMU is

 * essential for mmap_vmcore() in order to map physically

 * non-contiguous objects (ELF header, ELF note segment and memory

 * regions in the 1st kernel pointed to by PT_LOAD entries) into

 * virtually contiguous user-space in ELF layout.

 */

#ifdef CONFIG_MMU



/*

 * The vmcore fault handler uses the page cache and fills data using the

 * standard __read_vmcore() function.
@@ -457,34 +485,6 @@ static vm_fault_t mmap_vmcore_fault(struct vm_fault *vmf) 
#endif

}



/**

 * vmcore_alloc_buf - allocate buffer in vmalloc memory

 * @size: size of buffer

 *

 * If CONFIG_MMU is defined, use vmalloc_user() to allow users to mmap

 * the buffer to user-space by means of remap_vmalloc_range().

 *

 * If CONFIG_MMU is not defined, use vzalloc() since mmap_vmcore() is

 * disabled and there's no need to allow users to mmap the buffer.

 */

static inline char *vmcore_alloc_buf(size_t size)

{

#ifdef CONFIG_MMU

	return vmalloc_user(size);

#else

	return vzalloc(size);

#endif

}



/*

 * Disable mmap_vmcore() if CONFIG_MMU is not defined. MMU is

 * essential for mmap_vmcore() in order to map physically

 * non-contiguous objects (ELF header, ELF note segment and memory

 * regions in the 1st kernel pointed to by PT_LOAD entries) into

 * virtually contiguous user-space in ELF layout.

 */

#ifdef CONFIG_MMU



static const struct vm_operations_struct vmcore_mmap_ops = {

	.fault = mmap_vmcore_fault,

};