Commit 8b0582f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 493f3f38 b029628b

arch/alpha/include/asm/elf.h

+1 −5
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG]; 
/*

 * This is used to ensure we don't load something for the wrong architecture.

 */

#define elf_check_arch(x) ((x)->e_machine == EM_ALPHA)

#define elf_check_arch(x) (((x)->e_machine == EM_ALPHA) && !((x)->e_flags & EF_ALPHA_32BIT))



/*

 * These are used to set parameters in the core dumps.
@@ -137,10 +137,6 @@ extern int dump_elf_task(elf_greg_t *dest, struct task_struct *task); 
	: amask (AMASK_CIX) ? "ev6" : "ev67");	\

})



#define SET_PERSONALITY(EX)					\

	set_personality(((EX).e_flags & EF_ALPHA_32BIT)		\

	   ? PER_LINUX_32BIT : PER_LINUX)



extern int alpha_l1i_cacheshape;

extern int alpha_l1d_cacheshape;

extern int alpha_l2_cacheshape;

arch/alpha/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ static inline pte_t pte_swp_clear_exclusive(pte_t pte) 


extern void paging_init(void);



/* We have our own get_unmapped_area to cope with ADDR_LIMIT_32BIT.  */

/* We have our own get_unmapped_area */

#define HAVE_ARCH_UNMAPPED_AREA



#endif /* _ALPHA_PGTABLE_H */

arch/alpha/include/asm/processor.h

+2 −6
Original line number Diff line number Diff line
@@ -8,23 +8,19 @@ 
#ifndef __ASM_ALPHA_PROCESSOR_H

#define __ASM_ALPHA_PROCESSOR_H



#include <linux/personality.h>	/* for ADDR_LIMIT_32BIT */



/*

 * We have a 42-bit user address space: 4TB user VM...

 */

#define TASK_SIZE (0x40000000000UL)



#define STACK_TOP \

  (current->personality & ADDR_LIMIT_32BIT ? 0x80000000 : 0x00120000000UL)

#define STACK_TOP (0x00120000000UL)



#define STACK_TOP_MAX	0x00120000000UL



/* This decides where the kernel will search for a free chunk of vm

 * space during mmap's.

 */

#define TASK_UNMAPPED_BASE \

  ((current->personality & ADDR_LIMIT_32BIT) ? 0x40000000 : TASK_SIZE / 2)

#define TASK_UNMAPPED_BASE (TASK_SIZE / 2)



/* This is dead.  Everything has been moved to thread_info.  */

struct thread_struct { };

arch/alpha/kernel/osf_sys.c

+2 −9
Original line number Diff line number Diff line
@@ -1210,8 +1210,7 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p) 
	return ret;

}



/* Get an address range which is currently unmapped.  Similar to the

   generic version except that we know how to honor ADDR_LIMIT_32BIT.  */

/* Get an address range which is currently unmapped. */



static unsigned long

arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
@@ -1230,13 +1229,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, 
		       unsigned long len, unsigned long pgoff,

		       unsigned long flags, vm_flags_t vm_flags)

{

	unsigned long limit;



	/* "32 bit" actually means 31 bit, since pointers sign extend.  */

	if (current->personality & ADDR_LIMIT_32BIT)

		limit = 0x80000000;

	else

		limit = TASK_SIZE;

	unsigned long limit = TASK_SIZE;



	if (len > limit)

		return -ENOMEM;