leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UBI: Fastmap: Do not add vol if it already exists

Browse Source 
During fastmap attaching, check if a volume already exists when adding
the volume to volume tree. NOTE that the issue cannot happen, only if
the on-flash fastmap data is modified.

Signed-off-by: Sheng Yong <shengyong1@huawei.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
shengyong 2015-05-26 10:07:09 +00:00 committed by Richard Weinberger
parent e8d266cf8d
commit e96a8a3bb6
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/mtd/ubi/fastmap.c
View File

@ -192,8 +192,10 @@ static struct ubi_ainf_volume *add_vol(struct ubi_attach_info *ai, int vol_id,
if (vol_id > av->vol_id) if (vol_id > av->vol_id)
p = &(*p)->rb_left; p = &(*p)->rb_left;
else else if (vol_id < av->vol_id)
p = &(*p)->rb_right; p = &(*p)->rb_right;
else
return ERR_PTR(-EINVAL);
} }
av = kmalloc(sizeof(struct ubi_ainf_volume), GFP_KERNEL); av = kmalloc(sizeof(struct ubi_ainf_volume), GFP_KERNEL);
@ -748,6 +750,11 @@ static int ubi_attach_fastmap(struct ubi_device *ubi,
if (!av) if (!av)
goto fail_bad; goto fail_bad;
if (PTR_ERR(av) == -EINVAL) {
ubi_err(ubi, "volume (ID %i) already exists",
fmvhdr->vol_id);
goto fail_bad;
}
ai->vols_found++; ai->vols_found++;
if (ai->highest_vol_id < be32_to_cpu(fmvhdr->vol_id)) if (ai->highest_vol_id < be32_to_cpu(fmvhdr->vol_id))