mirror of https://github.com/hak5/openwrt-owl.git
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
|
From f41f8b42db092e505382f7120994de21590dff48 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
||
|
|
Date: Thu, 16 Oct 2014 20:52:16 +0200
|
||
|
|
Subject: [PATCH] UBI: Detect EOF mark and erase all remaining blocks
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
||
|
|
---
|
||
|
|
drivers/mtd/ubi/io.c | 5 +++++
|
||
|
|
1 file changed, 5 insertions(+)
|
||
|
|
|
||
|
|
--- a/drivers/mtd/ubi/io.c
|
||
|
|
+++ b/drivers/mtd/ubi/io.c
|
||
|
|
@@ -727,6 +727,7 @@ bad:
|
||
|
|
* o %UBI_IO_FF if only 0xFF bytes were read (the PEB is supposedly empty)
|
||
|
|
* o a negative error code in case of failure.
|
||
|
|
*/
|
||
|
|
+static bool erase_all_next = false;
|
||
|
|
int ubi_io_read_ec_hdr(struct ubi_device *ubi, int pnum,
|
||
|
|
struct ubi_ec_hdr *ec_hdr, int verbose)
|
||
|
|
{
|
||
|
|
@@ -753,6 +754,10 @@ int ubi_io_read_ec_hdr(struct ubi_device
|
||
|
|
}
|
||
|
|
|
||
|
|
magic = be32_to_cpu(ec_hdr->magic);
|
||
|
|
+ if (magic == 0xdeadc0de)
|
||
|
|
+ erase_all_next = true;
|
||
|
|
+ if (erase_all_next)
|
||
|
|
+ return read_err ? UBI_IO_FF_BITFLIPS : UBI_IO_FF;
|
||
|
|
if (magic != UBI_EC_HDR_MAGIC) {
|
||
|
|
if (mtd_is_eccerr(read_err))
|
||
|
|
return UBI_IO_BAD_HDR_EBADMSG;
|