update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/arch/mips/mm/mmap.c
..
..
@@ -20,43 +20,6 @@
20
20
 unsigned long shm_align_mask = PAGE_SIZE - 1;	/* Sane caches */
21
21
 EXPORT_SYMBOL(shm_align_mask);
22
22
 
23
-/* gap between mmap and stack */
24
-#define MIN_GAP		(128*1024*1024UL)
25
-#define MAX_GAP		((TASK_SIZE)/6*5)
26
-#define STACK_RND_MASK	(0x7ff >> (PAGE_SHIFT - 12))
27
-
28
-static int mmap_is_legacy(struct rlimit *rlim_stack)
29
-{
30
-	if (current->personality & ADDR_COMPAT_LAYOUT)
31
-		return 1;
32
-
33
-	if (rlim_stack->rlim_cur == RLIM_INFINITY)
34
-		return 1;
35
-
36
-	return sysctl_legacy_va_layout;
37
-}
38
-
39
-static unsigned long mmap_base(unsigned long rnd, struct rlimit *rlim_stack)
40
-{
41
-	unsigned long gap = rlim_stack->rlim_cur;
42
-	unsigned long pad = stack_guard_gap;
43
-
44
-	/* Account for stack randomization if necessary */
45
-	if (current->flags & PF_RANDOMIZE)
46
-		pad += (STACK_RND_MASK << PAGE_SHIFT);
47
-
48
-	/* Values close to RLIM_INFINITY can overflow. */
49
-	if (gap + pad > gap)
50
-		gap += pad;
51
-
52
-	if (gap < MIN_GAP)
53
-		gap = MIN_GAP;
54
-	else if (gap > MAX_GAP)
55
-		gap = MAX_GAP;
56
-
57
-	return PAGE_ALIGN(TASK_SIZE - gap - rnd);
58
-}
59
-
60
23
 #define COLOUR_ALIGN(addr, pgoff)				\
61
24
 	((((addr) + shm_align_mask) & ~shm_align_mask) +	\
62
25
 	 (((pgoff) << PAGE_SHIFT) & shm_align_mask))
..
..
@@ -154,69 +117,12 @@
154
117
 			addr0, len, pgoff, flags, DOWN);
155
118
 }
156
119
 
157
-unsigned long arch_mmap_rnd(void)
158
-{
159
-	unsigned long rnd;
160
-
161
-#ifdef CONFIG_COMPAT
162
-	if (TASK_IS_32BIT_ADDR)
163
-		rnd = get_random_long() & ((1UL << mmap_rnd_compat_bits) - 1);
164
-	else
165
-#endif /* CONFIG_COMPAT */
166
-		rnd = get_random_long() & ((1UL << mmap_rnd_bits) - 1);
167
-
168
-	return rnd << PAGE_SHIFT;
169
-}
170
-
171
-void arch_pick_mmap_layout(struct mm_struct *mm, struct rlimit *rlim_stack)
172
-{
173
-	unsigned long random_factor = 0UL;
174
-
175
-	if (current->flags & PF_RANDOMIZE)
176
-		random_factor = arch_mmap_rnd();
177
-
178
-	if (mmap_is_legacy(rlim_stack)) {
179
-		mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
180
-		mm->get_unmapped_area = arch_get_unmapped_area;
181
-	} else {
182
-		mm->mmap_base = mmap_base(random_factor, rlim_stack);
183
-		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
184
-	}
185
-}
186
-
187
-static inline unsigned long brk_rnd(void)
188
-{
189
-	unsigned long rnd = get_random_long();
190
-
191
-	rnd = rnd << PAGE_SHIFT;
192
-	/* 8MB for 32bit, 256MB for 64bit */
193
-	if (TASK_IS_32BIT_ADDR)
194
-		rnd = rnd & 0x7ffffful;
195
-	else
196
-		rnd = rnd & 0xffffffful;
197
-
198
-	return rnd;
199
-}
200
-
201
-unsigned long arch_randomize_brk(struct mm_struct *mm)
202
-{
203
-	unsigned long base = mm->brk;
204
-	unsigned long ret;
205
-
206
-	ret = PAGE_ALIGN(base + brk_rnd());
207
-
208
-	if (ret < mm->brk)
209
-		return mm->brk;
210
-
211
-	return ret;
212
-}
213
-
214
-int __virt_addr_valid(const volatile void *kaddr)
120
+bool __virt_addr_valid(const volatile void *kaddr)
215
121
 {
216
122
 	unsigned long vaddr = (unsigned long)kaddr;
217
123
 
218
124
 	if ((vaddr < PAGE_OFFSET) || (vaddr >= MAP_BASE))
219
-		return 0;
125
+		return false;
220
126
 
221
127
 	return pfn_valid(PFN_DOWN(virt_to_phys(kaddr)));
222
128
 }