AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

x86: Use helpers for rlimits

Browse Source 
Make sure compiler won't do weird things with limits.  Fetching them
twice may return 2 different values after writable limits are
implemented.

We can either use rlimit helpers added in
3e10e716ab or ACCESS_ONCE if not
applicable; this patch uses the helpers.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
LKML-Reference: <1264609942-24621-1-git-send-email-jslaby@suse.cz>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
Jiri Slaby 2010-01-27 17:32:22 +01:00 committed by H. Peter Anvin
parent be8cde8b24
commit 2854e72b58
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/ia32/ia32_aout.c
View File

@ -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 * size limits imposed on them by creating programs with large
* arrays in the data or bss. * arrays in the data or bss.
*/ */
rlim = current->signal->rlim[RLIMIT_DATA].rlim_cur; rlim = rlimit(RLIMIT_DATA);
if (rlim >= RLIM_INFINITY) if (rlim >= RLIM_INFINITY)
rlim = ~0; rlim = ~0;
if (ex.a_data + ex.a_bss > rlim) if (ex.a_data + ex.a_bss > rlim)

4
arch/x86/mm/mmap.c
View File

@ -71,7 +71,7 @@ static int mmap_is_legacy(void)
if (current->personality & ADDR_COMPAT_LAYOUT) if (current->personality & ADDR_COMPAT_LAYOUT)
return 1; return 1;
if (current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY) if (rlimit(RLIMIT_STACK) == RLIM_INFINITY)
return 1; return 1;
return sysctl_legacy_va_layout; return sysctl_legacy_va_layout;
@ -96,7 +96,7 @@ static unsigned long mmap_rnd(void)
static unsigned long mmap_base(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) if (gap < MIN_GAP)
gap = MIN_GAP; gap = MIN_GAP;