x86/rlimit change for v2.6.34
Linus,
Please pull the latest x86-rlimit-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-rlimit-for-linus
Thanks,
Ingo
------------------>
Jiri Slaby (1):
x86: Use helpers for rlimits
arch/x86/ia32/ia32_aout.c | 2 +- arch/x86/mm/mmap.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/x86/ia32/ia32_aout.c +1 -1
@@ -297,7 +297,7 @@ static int load_aout_binary(struct linux_binprm *bprm, struct pt_regs *regs)* size limits imposed on them by creating programs with large * arrays in the data or bss. */ - rlim = current->signal->rlim[RLIMIT_DATA ].rlim_cur; + rlim =rlimit (RLIMIT_DATA );if (rlim >=RLIM_INFINITY ) rlim = ~0 ;if (ex.a_data + ex.a_bss > rlim)
arch/x86/mm/mmap.c +2 -2
@@ -71,7 +71,7 @@ static int mmap_is_legacy(void)if (current->personality &ADDR_COMPAT_LAYOUT )return 1 ; -if (current->signal->rlim[RLIMIT_STACK ].rlim_cur ==RLIM_INFINITY ) +if (rlimit (RLIMIT_STACK ) ==RLIM_INFINITY )return 1 ;return sysctl_legacy_va_layout;
@@ -96,7 +96,7 @@ static unsigned long mmap_rnd(void)static unsigned long mmap_base (void ) { -unsigned long gap = current->signal->rlim[RLIMIT_STACK ].rlim_cur; +unsigned long gap =rlimit (RLIMIT_STACK );if (gap <MIN_GAP ) gap =MIN_GAP ;