From patchwork Wed Jun 13 10:42:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Weinberger X-Patchwork-Id: 164629 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1C2F0B6FD3 for ; Wed, 13 Jun 2012 20:45:26 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Sel3O-0007cZ-5U; Wed, 13 Jun 2012 10:43:58 +0000 Received: from a.ns.miles-group.at ([95.130.255.143] helo=radon.swed.at) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Sel2B-0007Ab-Bk for linux-mtd@lists.infradead.org; Wed, 13 Jun 2012 10:42:47 +0000 Received: (qmail 12315 invoked by uid 89); 13 Jun 2012 10:42:42 -0000 Received: by simscan 1.3.1 ppid: 12079, pid: 12312, t: 0.1001s scanners: attach: 1.3.1 clamav: 0.96.5/m:53 Received: from unknown (HELO localhost.localdomain) (richard@nod.at@212.62.202.73) by radon.swed.at with ESMTPA; 13 Jun 2012 10:42:42 -0000 From: Richard Weinberger To: linux-mtd@lists.infradead.org Subject: [PATCH 15/21] UBI: Fastmap: Fix NULL-pointer bug Date: Wed, 13 Jun 2012 12:42:12 +0200 Message-Id: <1339584138-69914-16-git-send-email-richard@nod.at> X-Mailer: git-send-email 1.7.6.5 In-Reply-To: <1339584138-69914-1-git-send-email-richard@nod.at> References: <1339584138-69914-1-git-send-email-richard@nod.at> X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Richard Weinberger , adrian.hunter@intel.com, Heinz.Egger@linutronix.de, shmulik.ladkani@gmail.com, tglx@linutronix.de, tim.bird@am.sony.com X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Signed-off-by: Richard Weinberger --- drivers/mtd/ubi/fastmap.c | 4 ++-- drivers/mtd/ubi/wl.c | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c index 29e6d69..65cb3f1 100644 --- a/drivers/mtd/ubi/fastmap.c +++ b/drivers/mtd/ubi/fastmap.c @@ -1342,8 +1342,8 @@ int ubi_update_fastmap(struct ubi_device *ubi) goto err; } - new_fm->e[0]->pnum = old_fm->e[0]->pnum; - new_fm->e[0]->ec = old_fm->e[0]->ec; + tmp_e->pnum = old_fm->e[0]->pnum; + tmp_e->ec = old_fm->e[0]->ec; } else { /* we've got a new early PEB, return the old one */ ubi_wl_put_fm_peb(ubi, old_fm->e[0], 0); diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c index def6a88..004ce89 100644 --- a/drivers/mtd/ubi/wl.c +++ b/drivers/mtd/ubi/wl.c @@ -1251,9 +1251,6 @@ static int erase_worker(struct ubi_device *ubi, struct ubi_work *wl_wrk, * protected physical eraseblocks. */ serve_prot_queue(ubi); - - /* And take care about wear-leveling */ - err = ensure_wear_leveling(ubi); return err; }