Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'execve-v6.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull execve fix from Kees Cook:
"This is an alpha-specific fix, but since it touched ELF I was asked to
carry it.
- alpha/elf: Fix misc/setarch test of util-linux by removing 32bit
support (Eric W. Biederman)"
* tag 'execve-v6.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
alpha/elf: Fix misc/setarch test of util-linux by removing 32bit support
+6
-21
+1
-5
arch/alpha/include/asm/elf.h
+1
-5
arch/alpha/include/asm/elf.h
···
74
74
/*
75
75
* This is used to ensure we don't load something for the wrong architecture.
76
76
*/
77
-
#define elf_check_arch(x) ((x)->e_machine == EM_ALPHA)
77
+
#define elf_check_arch(x) (((x)->e_machine == EM_ALPHA) && !((x)->e_flags & EF_ALPHA_32BIT))
78
78
79
79
/*
80
80
* These are used to set parameters in the core dumps.
···
136
136
( i_ == IMPLVER_EV5 ? "ev56" \
137
137
: amask (AMASK_CIX) ? "ev6" : "ev67"); \
138
138
})
139
-
140
-
#define SET_PERSONALITY(EX) \
141
-
set_personality(((EX).e_flags & EF_ALPHA_32BIT) \
142
-
? PER_LINUX_32BIT : PER_LINUX)
143
139
144
140
extern int alpha_l1i_cacheshape;
145
141
extern int alpha_l1d_cacheshape;
+1
-1
arch/alpha/include/asm/pgtable.h
+1
-1
arch/alpha/include/asm/pgtable.h
+2
-6
arch/alpha/include/asm/processor.h
+2
-6
arch/alpha/include/asm/processor.h
···
8
8
#ifndef __ASM_ALPHA_PROCESSOR_H
9
9
#define __ASM_ALPHA_PROCESSOR_H
10
10
11
-
#include <linux/personality.h> /* for ADDR_LIMIT_32BIT */
12
-
13
11
/*
14
12
* We have a 42-bit user address space: 4TB user VM...
15
13
*/
16
14
#define TASK_SIZE (0x40000000000UL)
17
15
18
-
#define STACK_TOP \
19
-
(current->personality & ADDR_LIMIT_32BIT ? 0x80000000 : 0x00120000000UL)
16
+
#define STACK_TOP (0x00120000000UL)
20
17
21
18
#define STACK_TOP_MAX 0x00120000000UL
22
19
23
20
/* This decides where the kernel will search for a free chunk of vm
24
21
* space during mmap's.
25
22
*/
26
-
#define TASK_UNMAPPED_BASE \
27
-
((current->personality & ADDR_LIMIT_32BIT) ? 0x40000000 : TASK_SIZE / 2)
23
+
#define TASK_UNMAPPED_BASE (TASK_SIZE / 2)
28
24
29
25
/* This is dead. Everything has been moved to thread_info. */
30
26
struct thread_struct { };
+2
-9
arch/alpha/kernel/osf_sys.c
+2
-9
arch/alpha/kernel/osf_sys.c
···
1210
1210
return ret;
1211
1211
}
1212
1212
1213
-
/* Get an address range which is currently unmapped. Similar to the
1214
-
generic version except that we know how to honor ADDR_LIMIT_32BIT. */
1213
+
/* Get an address range which is currently unmapped. */
1215
1214
1216
1215
static unsigned long
1217
1216
arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
···
1229
1230
unsigned long len, unsigned long pgoff,
1230
1231
unsigned long flags, vm_flags_t vm_flags)
1231
1232
{
1232
-
unsigned long limit;
1233
-
1234
-
/* "32 bit" actually means 31 bit, since pointers sign extend. */
1235
-
if (current->personality & ADDR_LIMIT_32BIT)
1236
-
limit = 0x80000000;
1237
-
else
1238
-
limit = TASK_SIZE;
1233
+
unsigned long limit = TASK_SIZE;
1239
1234
1240
1235
if (len > limit)
1241
1236
return -ENOMEM;