Commit c1e0d97d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
  [S390] MAINTAINERS: Update zcrypt driver entry
  [S390] Randomize PIEs
  [S390] Randomise the brk region
  [S390] Add is_32bit_task() helper function
  [S390] Randomize lower bits of stack address
  [S390] Randomize mmap start address
  [S390] Rearrange mmap.c
  [S390] Enable flexible mmap layout for 64 bit processes
  [S390] vdso: dont map at mmap_base
  [S390] reduce miminum gap between stack and mmap_base
  [S390] mmap: consider stack address randomization
  [S390] Update default configuration
  [S390] cio: path_event overindication after resume
parents 7f5db6a8 51120c2c

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -5272,8 +5272,7 @@ S: Supported 
F:	drivers/s390/net/



S390 ZCRYPT DRIVER

M:	Felix Beck <felix.beck@de.ibm.com>

M:	Ralph Wuerthner <ralph.wuerthner@de.ibm.com>

M:	Holger Dengler <hd@linux.vnet.ibm.com>

M:	linux390@de.ibm.com

L:	linux-s390@vger.kernel.org

W:	http://www.ibm.com/developerworks/linux/linux390/

arch/s390/defconfig

+15 −1
Original line number Diff line number Diff line
@@ -5,10 +5,21 @@ CONFIG_AUDIT=y 
CONFIG_RCU_TRACE=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_CGROUPS=y

CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_RESOURCE_COUNTERS=y

CONFIG_CGROUP_MEM_RES_CTLR=y

CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y

CONFIG_CGROUP_SCHED=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_BLK_CGROUP=y

CONFIG_BLK_DEV_INITRD=y

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_PERF_EVENTS=y

# CONFIG_COMPAT_BRK is not set

CONFIG_SLAB=y

CONFIG_PROFILING=y

CONFIG_OPROFILE=y

CONFIG_KPROBES=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y
@@ -19,7 +30,9 @@ CONFIG_HIGH_RES_TIMERS=y 
CONFIG_PREEMPT=y

CONFIG_MEMORY_HOTPLUG=y

CONFIG_MEMORY_HOTREMOVE=y

CONFIG_KSM=y

CONFIG_BINFMT_MISC=m

CONFIG_CMM=m

CONFIG_HZ_100=y

CONFIG_KEXEC=y

CONFIG_PM=y
@@ -105,6 +118,7 @@ CONFIG_DEBUG_LIST=y 
CONFIG_DEBUG_NOTIFIERS=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_KPROBES_SANITY_TEST=y

CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y

CONFIG_CPU_NOTIFIER_ERROR_INJECT=m

CONFIG_LATENCYTOP=y

CONFIG_SYSCTL_SYSCALL_CHECK=y

arch/s390/include/asm/compat.h

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr) 


static inline int is_compat_task(void)

{

	return test_thread_flag(TIF_31BIT);

	return is_32bit_task();

}



#else

arch/s390/include/asm/elf.h

+8 −1
Original line number Diff line number Diff line
@@ -161,7 +161,9 @@ extern unsigned int vdso_enabled; 
   use of this is to invoke "./ld.so someprog" to test out a new version of

   the loader.  We need to make sure that it is out of the way of the program

   that it will "exec", and that there is sufficient room for the brk.  */

#define ELF_ET_DYN_BASE		(STACK_TOP / 3 * 2)



extern unsigned long randomize_et_dyn(unsigned long base);

#define ELF_ET_DYN_BASE		(randomize_et_dyn(STACK_TOP / 3 * 2))



/* This yields a mask that user programs can use to figure out what

   instruction set this CPU supports. */
@@ -206,6 +208,8 @@ do { \ 
	current->mm->context.noexec == 0;		\

})



#define STACK_RND_MASK	0x7ffUL



#define ARCH_DLINFO							    \

do {									    \

	if (vdso_enabled)						    \
@@ -218,4 +222,7 @@ struct linux_binprm; 
#define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1

int arch_setup_additional_pages(struct linux_binprm *, int);



extern unsigned long arch_randomize_brk(struct mm_struct *mm);

#define arch_randomize_brk arch_randomize_brk



#endif

arch/s390/include/asm/system.h

+1 −1
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ extern void (*_machine_restart)(char *command); 
extern void (*_machine_halt)(void);

extern void (*_machine_power_off)(void);



#define arch_align_stack(x) (x)

extern unsigned long arch_align_stack(unsigned long sp);



static inline int tprot(unsigned long addr)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE