Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2854e72b authored Jan 27, 2010 by Jiri Slaby Committed by H. Peter Anvin Jan 27, 2010

x86: Use helpers for rlimits



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
3e10e716 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>

parent be8cde8b

arch/x86/ia32/ia32_aout.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -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;