mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-25 14:20:52 +07:00
UBI: release locks in check_corruption
Commit 45aafd3299
"UBI: tighten the corrupted PEB criteria"
introduced some return paths that didn't release the ubi->buf_mutex
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
This commit is contained in:
parent
e53beacd23
commit
1b1d76e2df
@ -787,16 +787,15 @@ static int check_corruption(struct ubi_device *ubi, struct ubi_vid_hdr *vid_hdr,
|
|||||||
* erased, so it became unstable and corrupted, and should be
|
* erased, so it became unstable and corrupted, and should be
|
||||||
* erased.
|
* erased.
|
||||||
*/
|
*/
|
||||||
return 0;
|
err = 0;
|
||||||
|
goto out_unlock;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (err)
|
if (err)
|
||||||
return err;
|
goto out_unlock;
|
||||||
|
|
||||||
if (ubi_check_pattern(ubi->peb_buf1, 0xFF, ubi->leb_size)) {
|
if (ubi_check_pattern(ubi->peb_buf1, 0xFF, ubi->leb_size))
|
||||||
mutex_unlock(&ubi->buf_mutex);
|
goto out_unlock;
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
ubi_err("PEB %d contains corrupted VID header, and the data does not "
|
ubi_err("PEB %d contains corrupted VID header, and the data does not "
|
||||||
"contain all 0xFF, this may be a non-UBI PEB or a severe VID "
|
"contain all 0xFF, this may be a non-UBI PEB or a severe VID "
|
||||||
@ -806,8 +805,11 @@ static int check_corruption(struct ubi_device *ubi, struct ubi_vid_hdr *vid_hdr,
|
|||||||
pnum, ubi->leb_start, ubi->leb_size);
|
pnum, ubi->leb_start, ubi->leb_size);
|
||||||
ubi_dbg_print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 1,
|
ubi_dbg_print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 1,
|
||||||
ubi->peb_buf1, ubi->leb_size, 1);
|
ubi->peb_buf1, ubi->leb_size, 1);
|
||||||
|
err = 1;
|
||||||
|
|
||||||
|
out_unlock:
|
||||||
mutex_unlock(&ubi->buf_mutex);
|
mutex_unlock(&ubi->buf_mutex);
|
||||||
return 1;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user