From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752832AbZHKBgY (ORCPT ); Mon, 10 Aug 2009 21:36:24 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752481AbZHKBgX (ORCPT ); Mon, 10 Aug 2009 21:36:23 -0400 Received: from mail-pz0-f196.google.com ([209.85.222.196]:49044 "EHLO mail-pz0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752479AbZHKBgW (ORCPT ); Mon, 10 Aug 2009 21:36:22 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:x-mailer:mime-version :content-type:content-transfer-encoding; b=oBbrNck/1rK+LJqiWabu4aTmITFgmR2bbu+momG5sg5J78Zoaadjaq5e2wBpifqHKo opPr5zzd6wSxI9YcmeV5TW2VY4tjsZ0S5f2CFewh5nz8Y375zk7slvObUdlEBWoMf2WI gzUK6tOg8tiBOmpa/9aYJo0NA3Y+uT6jUXyxE= Date: Tue, 11 Aug 2009 09:44:55 +0800 From: JiSheng Zhang To: linux-mtd@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Artem.Bityutskiy@nokia.com, adrian.hunter@nokia.com, rmk@arm.linux.org.uk, dwmw2@infradead.org Subject: [PATCH] UBI: Fix allocation of volume table Message-ID: <20090811094455.6f9cbbfe@ustc> X-Mailer: Claws Mail 3.7.2 (GTK+ 2.16.4; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We can't use vmalloc for the buffer used for volume table for some NAND or NOR drivers may pass the buffer to DMA. And the volume table size a.k.a vtbl_size is small so we can use kmalloc or kzalloc for it instead Signed-off-by: JiSheng Zhang --- drivers/mtd/ubi/build.c | 6 +++--- drivers/mtd/ubi/vtbl.c | 18 ++++++++---------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c index e1f7d0a..1c1f877 100644 --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c @@ -605,7 +605,7 @@ out_wl: ubi_wl_close(ubi); out_vtbl: free_internal_volumes(ubi); - vfree(ubi->vtbl); + kfree(ubi->vtbl); out_si: ubi_scan_destroy_si(si); return err; @@ -1031,7 +1031,7 @@ out_detach: if (do_free) free_user_volumes(ubi); free_internal_volumes(ubi); - vfree(ubi->vtbl); + kfree(ubi->vtbl); out_free: vfree(ubi->peb_buf1); vfree(ubi->peb_buf2); @@ -1102,7 +1102,7 @@ int ubi_detach_mtd_dev(int ubi_num, int anyway) uif_close(ubi); ubi_wl_close(ubi); free_internal_volumes(ubi); - vfree(ubi->vtbl); + kfree(ubi->vtbl); put_mtd_device(ubi->mtd); vfree(ubi->peb_buf1); vfree(ubi->peb_buf2); diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c index 1afc61e..59e452a 100644 --- a/drivers/mtd/ubi/vtbl.c +++ b/drivers/mtd/ubi/vtbl.c @@ -424,12 +424,11 @@ static struct ubi_vtbl_record *process_lvol(struct ubi_device *ubi, /* Read both LEB 0 and LEB 1 into memory */ ubi_rb_for_each_entry(rb, seb, &sv->root, u.rb) { - leb[seb->lnum] = vmalloc(ubi->vtbl_size); + leb[seb->lnum] = kzalloc(ubi->vtbl_size, GFP_KERNEL); if (!leb[seb->lnum]) { err = -ENOMEM; goto out_free; } - memset(leb[seb->lnum], 0, ubi->vtbl_size); err = ubi_io_read_data(ubi, leb[seb->lnum], seb->pnum, 0, ubi->vtbl_size); @@ -470,7 +469,7 @@ static struct ubi_vtbl_record *process_lvol(struct ubi_device *ubi, } /* Both LEB 1 and LEB 2 are OK and consistent */ - vfree(leb[1]); + kfree(leb[1]); return leb[0]; } else { /* LEB 0 is corrupted or does not exist */ @@ -491,13 +490,13 @@ static struct ubi_vtbl_record *process_lvol(struct ubi_device *ubi, goto out_free; ubi_msg("volume table was restored"); - vfree(leb[0]); + kfree(leb[0]); return leb[1]; } out_free: - vfree(leb[0]); - vfree(leb[1]); + kfree(leb[0]); + kfree(leb[1]); return ERR_PTR(err); } @@ -515,10 +514,9 @@ static struct ubi_vtbl_record *create_empty_lvol(struct ubi_device *ubi, int i; struct ubi_vtbl_record *vtbl; - vtbl = vmalloc(ubi->vtbl_size); + vtbl = kzalloc(ubi->vtbl_size, GFP_KERNEL); if (!vtbl) return ERR_PTR(-ENOMEM); - memset(vtbl, 0, ubi->vtbl_size); for (i = 0; i < ubi->vtbl_slots; i++) memcpy(&vtbl[i], &empty_vtbl_record, UBI_VTBL_RECORD_SIZE); @@ -528,7 +526,7 @@ static struct ubi_vtbl_record *create_empty_lvol(struct ubi_device *ubi, err = create_vtbl(ubi, si, i, vtbl); if (err) { - vfree(vtbl); + kfree(vtbl); return ERR_PTR(err); } } @@ -856,7 +854,7 @@ int ubi_read_volume_table(struct ubi_device *ubi, struct ubi_scan_info *si) return 0; out_free: - vfree(ubi->vtbl); + kfree(ubi->vtbl); for (i = 0; i < ubi->vtbl_slots + UBI_INT_VOL_COUNT; i++) { kfree(ubi->volumes[i]); ubi->volumes[i] = NULL; -- 1.6.3.3