From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755815AbZKROws (ORCPT ); Wed, 18 Nov 2009 09:52:48 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757574AbZKROwD (ORCPT ); Wed, 18 Nov 2009 09:52:03 -0500 Received: from server1.wserver.cz ([82.113.45.157]:51207 "EHLO server1.wserver.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753582AbZKROv6 (ORCPT ); Wed, 18 Nov 2009 09:51:58 -0500 From: Jiri Slaby To: jirislaby@gmail.com Cc: mingo@elte.hu, nhorman@tuxdriver.com, sfr@canb.auug.org.au, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, marcin.slusarz@gmail.com, tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, torvalds@linux-foundation.org, Jiri Slaby , James Morris , Heiko Carstens , Martin Schwidefsky , linux390@de.ibm.com, linux-s390@vger.kernel.org Subject: [PATCH 05/16] S390: use ACCESS_ONCE for rlimits Date: Wed, 18 Nov 2009 15:51:51 +0100 Message-Id: <1258555922-2064-5-git-send-email-jslaby@novell.com> X-Mailer: git-send-email 1.6.4.2 In-Reply-To: <4B040A03.2020508@gmail.com> References: <4B040A03.2020508@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Make sure compiler won't do weird things with limits. E.g. fetching them twice may return 2 different values after writable limits are implemented. Signed-off-by: Jiri Slaby Cc: James Morris Cc: Heiko Carstens Cc: Andrew Morton Cc: Ingo Molnar Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: linux390@de.ibm.com Cc: linux-s390@vger.kernel.org --- arch/s390/mm/mmap.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c index f4558cc..90d3216 100644 --- a/arch/s390/mm/mmap.c +++ b/arch/s390/mm/mmap.c @@ -40,7 +40,8 @@ static inline unsigned long mmap_base(void) { - unsigned long gap = current->signal->rlim[RLIMIT_STACK].rlim_cur; + unsigned long gap = ACCESS_ONCE(current->signal-> + rlim[RLIMIT_STACK].rlim_cur); if (gap < MIN_GAP) gap = MIN_GAP; @@ -59,9 +60,11 @@ static inline int mmap_is_legacy(void) if (!is_compat_task()) return 1; #endif + if (ACCESS_ONCE(current->signal->rlim[RLIMIT_STACK].rlim_cur) == + RLIM_INFINITY) + return 1; return sysctl_legacy_va_layout || - (current->personality & ADDR_COMPAT_LAYOUT) || - current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY; + (current->personality & ADDR_COMPAT_LAYOUT); } #ifndef CONFIG_64BIT -- 1.6.4.2