adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6

Browse source 
* 'for-linus' of git://git.infradead.org/ubi-2.6:
  UBI: compatible fallback in absense of sequence numbers
  UBI: fix double free on error path
This commit is contained in:
Linus Torvalds 2009-08-09 14:58:34 -07:00
commit f4b9a98868
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/mtd/ubi/eba.c
View file

@ -1254,6 +1254,7 @@ out_free:
if (!ubi->volumes[i]) if (!ubi->volumes[i])
continue; continue;
kfree(ubi->volumes[i]->eba_tbl); kfree(ubi->volumes[i]->eba_tbl);
ubi->volumes[i]->eba_tbl = NULL;
} }
return err; return err;
} }

13
drivers/mtd/ubi/scan.c
View file

@ -781,11 +781,22 @@ static int process_eb(struct ubi_device *ubi, struct ubi_scan_info *si,
return -EINVAL; return -EINVAL;
} }
/*
* Make sure that all PEBs have the same image sequence number.
* This allows us to detect situations when users flash UBI
* images incorrectly, so that the flash has the new UBI image
* and leftovers from the old one. This feature was added
* relatively recently, and the sequence number was always
* zero, because old UBI implementations always set it to zero.
* For this reasons, we do not panic if some PEBs have zero
* sequence number, while other PEBs have non-zero sequence
* number.
*/
image_seq = be32_to_cpu(ech->image_seq); image_seq = be32_to_cpu(ech->image_seq);
if (!si->image_seq_set) { if (!si->image_seq_set) {
ubi->image_seq = image_seq; ubi->image_seq = image_seq;
si->image_seq_set = 1; si->image_seq_set = 1;
} else if (ubi->image_seq != image_seq) { } else if (ubi->image_seq && ubi->image_seq != image_seq) {
ubi_err("bad image sequence number %d in PEB %d, " ubi_err("bad image sequence number %d in PEB %d, "
"expected %d", image_seq, pnum, ubi->image_seq); "expected %d", image_seq, pnum, ubi->image_seq);
ubi_dbg_dump_ec_hdr(ech); ubi_dbg_dump_ec_hdr(ech);