From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759152AbZFCPKs (ORCPT ); Wed, 3 Jun 2009 11:10:48 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755324AbZFCPKl (ORCPT ); Wed, 3 Jun 2009 11:10:41 -0400 Received: from mx2.redhat.com ([66.187.237.31]:56933 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755185AbZFCPKk (ORCPT ); Wed, 3 Jun 2009 11:10:40 -0400 Date: Wed, 3 Jun 2009 16:45:52 +0200 From: Andrea Arcangeli To: akpm@linux-foundation.org Cc: hugh@veritas.com, linux-kernel@vger.kernel.org, Izik Eidus , nickpiggin@yahoo.com.au, chrisw@redhat.com, linux-mm@kvack.org, riel@redhat.com Subject: [PATCH] ksm: fix rmap_item use after free Message-ID: <20090603144552.GB30426@random.random> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andrea Arcangeli This avoid crashing with slab debugging enabled by removing a window for memory corruption if freed slab entries are reused before we read the next pointer. Against mmotm. Signed-off-by: Andrea Arcangeli --- diff --git a/mm/ksm.c b/mm/ksm.c index 74d921b..f060e87 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -892,7 +892,7 @@ static struct rmap_item *stable_tree_search(struct page *page, { struct rb_node *node = root_stable_tree.rb_node; struct tree_item *tree_item; - struct rmap_item *found_rmap_item; + struct rmap_item *found_rmap_item, *next_rmap_item; while (node) { int ret; @@ -907,9 +907,11 @@ static struct rmap_item *stable_tree_search(struct page *page, found_rmap_item->address == rmap_item->address)) { if (!is_zapped_item(found_rmap_item, page2)) break; + next_rmap_item = found_rmap_item->next; remove_rmap_item_from_tree(found_rmap_item); - } - found_rmap_item = found_rmap_item->next; + found_rmap_item = next_rmap_item; + } else + found_rmap_item = found_rmap_item->next; } if (!found_rmap_item) goto out_didnt_find; @@ -959,7 +961,7 @@ static int stable_tree_insert(struct page *page, while (*new) { int ret; - struct rmap_item *insert_rmap_item; + struct rmap_item *insert_rmap_item, *next_rmap_item; tree_item = rb_entry(*new, struct tree_item, node); BUG_ON(!tree_item); @@ -973,9 +975,11 @@ static int stable_tree_insert(struct page *page, insert_rmap_item->address == rmap_item->address)) { if (!is_zapped_item(insert_rmap_item, page2)) break; + next_rmap_item = insert_rmap_item->next; remove_rmap_item_from_tree(insert_rmap_item); - } - insert_rmap_item = insert_rmap_item->next; + insert_rmap_item = next_rmap_item; + } else + insert_rmap_item = insert_rmap_item->next; } if (!insert_rmap_item) return 1;