Commit 4806364a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2023-07-18-12-28' of... 

Merge tag 'mm-hotfixes-stable-2023-07-18-12-28' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull hotfixes from Andrew Morton:
 "Seven hotfixes, six of which are cc:stable and one of which addresses
  a post-6.5 issue"

* tag 'mm-hotfixes-stable-2023-07-18-12-28' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  maple_tree: fix node allocation testing on 32 bit
  maple_tree: fix 32 bit mas_next testing
  selftests/mm: mkdirty: fix incorrect position of #endif
  maple_tree: set the node limit when creating a new root node
  mm/mlock: fix vma iterator conversion of apply_vma_lock_flags()
  prctl: move PR_GET_AUXV out of PR_MCE_KILL
  selftests/mm: give scripts execute permission
parents 74f1456c ef5c3de5

kernel/sys.c

+5 −5
Original line number Diff line number Diff line
@@ -2535,11 +2535,6 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3, 
			else

				return -EINVAL;

			break;

	case PR_GET_AUXV:

		if (arg4 || arg5)

			return -EINVAL;

		error = prctl_get_auxv((void __user *)arg2, arg3);

		break;

		default:

			return -EINVAL;

		}
@@ -2694,6 +2689,11 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3, 
	case PR_SET_VMA:

		error = prctl_set_vma(arg2, arg3, arg4, arg5);

		break;

	case PR_GET_AUXV:

		if (arg4 || arg5)

			return -EINVAL;

		error = prctl_get_auxv((void __user *)arg2, arg3);

		break;

#ifdef CONFIG_KSM

	case PR_SET_MEMORY_MERGE:

		if (arg3 || arg4 || arg5)

lib/maple_tree.c

+2 −1
Original line number Diff line number Diff line
@@ -3692,7 +3692,8 @@ static inline int mas_root_expand(struct ma_state *mas, void *entry) 
	mas->offset = slot;

	pivots[slot] = mas->last;

	if (mas->last != ULONG_MAX)

		slot++;

		pivots[++slot] = ULONG_MAX;



	mas->depth = 1;

	mas_set_height(mas);

	ma_set_meta(node, maple_leaf_64, 0, slot);

lib/test_maple_tree.c

+4 −1
Original line number Diff line number Diff line
@@ -1898,13 +1898,16 @@ static noinline void __init next_prev_test(struct maple_tree *mt) 
						   725};

	static const unsigned long level2_32[] = { 1747, 2000, 1750, 1755,

						   1760, 1765};

	unsigned long last_index;



	if (MAPLE_32BIT) {

		nr_entries = 500;

		level2 = level2_32;

		last_index = 0x138e;

	} else {

		nr_entries = 200;

		level2 = level2_64;

		last_index = 0x7d6;

	}



	for (i = 0; i <= nr_entries; i++)
@@ -2011,7 +2014,7 @@ static noinline void __init next_prev_test(struct maple_tree *mt) 


	val = mas_next(&mas, ULONG_MAX);

	MT_BUG_ON(mt, val != NULL);

	MT_BUG_ON(mt, mas.index != 0x7d6);

	MT_BUG_ON(mt, mas.index != last_index);

	MT_BUG_ON(mt, mas.last != ULONG_MAX);



	val = mas_prev(&mas, 0);

mm/mlock.c

+5 −4
Original line number Diff line number Diff line
@@ -477,7 +477,6 @@ static int apply_vma_lock_flags(unsigned long start, size_t len, 
{

	unsigned long nstart, end, tmp;

	struct vm_area_struct *vma, *prev;

	int error;

	VMA_ITERATOR(vmi, current->mm, start);



	VM_BUG_ON(offset_in_page(start));
@@ -498,6 +497,7 @@ static int apply_vma_lock_flags(unsigned long start, size_t len, 
	nstart = start;

	tmp = vma->vm_start;

	for_each_vma_range(vmi, vma, end) {

		int error;

		vm_flags_t newflags;



		if (vma->vm_start != tmp)
@@ -511,14 +511,15 @@ static int apply_vma_lock_flags(unsigned long start, size_t len, 
			tmp = end;

		error = mlock_fixup(&vmi, vma, &prev, nstart, tmp, newflags);

		if (error)

			break;

			return error;

		tmp = vma_iter_end(&vmi);

		nstart = tmp;

	}



	if (vma_iter_end(&vmi) < end)

	if (tmp < end)

		return -ENOMEM;



	return error;

	return 0;

}



/*

tools/testing/radix-tree/maple.c

+3 −3
Original line number Diff line number Diff line
@@ -206,9 +206,9 @@ static noinline void __init check_new_node(struct maple_tree *mt) 
				e = i - 1;

		} else {

			if (i >= 4)

				e = i - 4;

			else if (i == 3)

				e = i - 2;

				e = i - 3;

			else if (i >= 1)

				e = i - 1;

			else

				e = 0;

		}