mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Richard Weinberger <richard@nod.at>
Subject: [PATCH 5/9] UBI: Call scan_all() with correct offset in error case
Date: Tue,  7 Jan 2014 11:05:31 +0100	[thread overview]
Message-ID: <1389089135-29986-6-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1389089135-29986-1-git-send-email-s.hauer@pengutronix.de>

From: Richard Weinberger <richard@nod.at>

If we find an invalid fastmap we have to scan from the very beginning.
Otherwise we leak the first 64 PEBs.

Reported-and-tested-by: Richard Genoud <richard.genoud@gmail.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/mtd/ubi/attach.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c
index 62d6113..8c5c8c3 100644
--- a/drivers/mtd/ubi/attach.c
+++ b/drivers/mtd/ubi/attach.c
@@ -1397,9 +1397,11 @@ int ubi_attach(struct ubi_device *ubi, int force_scan)
 				ai = alloc_ai("ubi_aeb_slab_cache2");
 				if (!ai)
 					return -ENOMEM;
-			}
 
-			err = scan_all(ubi, ai, UBI_FM_MAX_START);
+				err = scan_all(ubi, ai, 0);
+			} else {
+				err = scan_all(ubi, ai, UBI_FM_MAX_START);
+			}
 		}
 	}
 #else
-- 
1.8.5.2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2014-01-07 10:11 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-07 10:05 UBI patches Sascha Hauer
2014-01-07 10:05 ` [PATCH 1/9] UBI: Fix PEB leak in wear_leveling_worker() Sascha Hauer
2014-01-07 10:05 ` [PATCH 2/9] UBI: Fix invalidate_fastmap() Sascha Hauer
2014-01-07 10:05 ` [PATCH 3/9] UBI: fix refill_wl_user_pool() Sascha Hauer
2014-01-07 10:05 ` [PATCH 4/9] UBI: Fix error path in scan_pool() Sascha Hauer
2014-01-07 10:05 ` Sascha Hauer [this message]
2014-01-07 10:05 ` [PATCH 6/9] UBI: fastmap: fix backward compatibility with image_seq Sascha Hauer
2014-01-07 10:05 ` [PATCH 7/9] UBI: simplify image sequence test Sascha Hauer
2014-01-07 10:05 ` [PATCH 8/9] UBI: Fix memory leak in ubi_attach_fastmap() error path Sascha Hauer
2014-01-07 10:05 ` [PATCH 9/9] UBI: Add some asserts to ubi_attach_fastmap() Sascha Hauer

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=1389089135-29986-6-git-send-email-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=richard@nod.at \
    /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