From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: stable-review@kernel.org, torvalds@linux-foundation.org,
akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk
Subject: [2/3] mm: fix missing page table unmap for stack guard page failure case
Date: Fri, 13 Aug 2010 14:42:57 -0700 [thread overview]
Message-ID: <20100813214646.217005989@clark.site> (raw)
In-Reply-To: <20100813214704.GA18960@kroah.com>
2.6.27-stable review patch. If anyone has any objections, please let us know.
------------------
From: Linus Torvalds <torvalds@linux-foundation.org>
commit 5528f9132cf65d4d892bcbc5684c61e7822b21e9 upstream.
.. which didn't show up in my tests because it's a no-op on x86-64 and
most other architectures. But we enter the function with the last-level
page table mapped, and should unmap it at exit.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
mm/memory.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2428,8 +2428,10 @@ static int do_anonymous_page(struct mm_s
spinlock_t *ptl;
pte_t entry;
- if (check_stack_guard_page(vma, address) < 0)
+ if (check_stack_guard_page(vma, address) < 0) {
+ pte_unmap(page_table);
return VM_FAULT_SIGBUS;
+ }
/* Allocate our own private page. */
pte_unmap(page_table);
next prev parent reply other threads:[~2010-08-13 21:49 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-13 21:47 [0/3] 2.6.27.52 stable review Greg KH
2010-08-13 21:42 ` [1/3] mm: keep a guard page below a grow-down stack segment Greg KH
2010-08-13 21:42 ` Greg KH [this message]
2010-08-13 21:42 ` [3/3] x86: dont send SIGBUS for kernel page faults Greg KH
2010-08-13 22:36 ` [0/3] 2.6.27.52 stable review Grant Coady
2010-08-13 23:07 ` Greg KH
2010-08-13 23:47 ` Grant Coady
2010-08-14 0:11 ` Greg KH
2010-08-14 0:51 ` Linus Torvalds
2010-08-14 2:53 ` Greg KH
2010-08-14 5:43 ` [Stable-review] " Willy Tarreau
2010-08-14 18:47 ` [stable] " Greg KH
2010-08-14 21:46 ` Greg KH
2010-08-14 7:24 ` Grant Coady
2010-08-14 19:12 ` [stable] " Greg KH
2010-08-15 1:28 ` Grant Coady
2010-08-14 0:12 ` Linus Torvalds
2010-08-14 0:47 ` Greg KH
2010-08-14 7:34 ` Grant Coady
2010-08-14 7:43 ` [Stable-review] " Willy Tarreau
2010-08-14 8:52 ` Grant Coady
2010-08-13 22:45 ` Willy Tarreau
2010-08-14 11:11 ` Gabor Z. Papp
2010-08-14 15:00 ` 2.6.27.52 " Grant Coady
2010-08-14 21:01 ` Greg KH
2010-08-14 22:11 ` Thomas Backlund
2010-08-23 22:27 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100813214646.217005989@clark.site \
--to=gregkh@suse.de \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=stable-review@kernel.org \
--cc=stable@kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome