From patchwork Wed Mar 24 13:55:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jing zhang X-Patchwork-Id: 48414 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 2414EB7CF1 for ; Thu, 25 Mar 2010 01:02:56 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756227Ab0CXOCk (ORCPT ); Wed, 24 Mar 2010 10:02:40 -0400 Received: from mail-yx0-f188.google.com ([209.85.210.188]:63010 "EHLO mail-yx0-f188.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756314Ab0CXOCj (ORCPT ); Wed, 24 Mar 2010 10:02:39 -0400 X-Greylist: delayed 402 seconds by postgrey-1.27 at vger.kernel.org; Wed, 24 Mar 2010 10:02:39 EDT Received: by yxe26 with SMTP id 26so2826649yxe.23 for ; Wed, 24 Mar 2010 07:02:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:date:message-id:subject :from:to:cc:content-type; bh=hYHX8y1noiQjXJVVHeKVVb/4ucxzt9T4oJlboG/9H3Q=; b=nBAFAbkVFquQeJt8GzkXRddkYjSwqEdye8WwekiMYsvlWo5UJnnTuaRmer1cvhIBT3 gk9WP2ctQfDNweeqQhLfnKBici8l9cqWZhccLHLzuEpL30vNeGUBMC/n1mNvO3RVYWrJ NPbeypAGkJrNuEUaDFJcr7xtiRDnNcmolOf0g= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:cc:content-type; b=C/3GncTcaJvr3bb7+aZ7b/bwPL4lep7YW5C219EIg982FMUwUBglBslLpux2FQCJVs x/ZR+ktKVfjYQGdA4O/6HiUb8JAcTTkon/FIdT2R+7RhTjy9e/aPoAyvP6TjAHcJlJR+ bFfcD/iIYU4cvLYfIRciRzkmPHZ5vsAi08WXA= MIME-Version: 1.0 Received: by 10.101.8.37 with SMTP id l37mr10451215ani.233.1269438955322; Wed, 24 Mar 2010 06:55:55 -0700 (PDT) Date: Wed, 24 Mar 2010 21:55:55 +0800 Message-ID: Subject: [PATCH] ext4: memory leakage in ext4_mb_free_blocks() From: jing zhang To: linux-ext4 Cc: "Theodore Ts'o" , Andreas Dilger , Dave Kleikamp Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Jing Zhang Date: Wed Mar 24 21:54:22 2010 There is memory leakage in ext4_mb_free_blocks(), if error, double free of blocks, occurs in ext4_mb_free_metadata(). Cc: Theodore Ts'o Cc: Andreas Dilger Cc: Dave Kleikamp Signed-off-by: Jing Zhang --- -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- linux-2.6.32/fs/ext4/mballoc.c 2009-12-03 11:51:22.000000000 +0800 +++ ext4_mm_leak/mballoc8.c 2010-03-24 21:46:50.000000000 +0800 @@ -4419,7 +4419,8 @@ ext4_mb_free_metadata(handle_t *handle, spin_lock(&sbi->s_md_lock); list_add(&new_entry->list, &handle->h_transaction->t_private_list); spin_unlock(&sbi->s_md_lock); - return 0; + /* info the caller new_entry is used */ + return 1; } /* @@ -4547,7 +4548,8 @@ do_more: ext4_lock_group(sb, block_group); mb_clear_bits(bitmap_bh->b_data, bit, count); - ext4_mb_free_metadata(handle, &e4b, new_entry); + if (0 == ext4_mb_free_metadata(handle, &e4b, new_entry)) + kmem_cache_free(ext4_free_ext_cachep, new_entry); } else { /* need to update group_info->bb_free and bitmap * with group lock held. generate_buddy look at