summaryrefslogtreecommitdiff
path: root/drivers/mtd/ubi/io.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-10-08 10:52:18 +0200
committerIngo Molnar <mingo@kernel.org>2015-10-08 10:52:18 +0200
commitd3df65c198dc2f1deefb73c8427b04d1bdd1b18d (patch)
treef348c249146e2a1bbe2040ebecb0c529f5449b84 /drivers/mtd/ubi/io.c
parent712df65ccb63da08a484bf57c40b250dfd4103a7 (diff)
parent00e6fa5fe15c0eccc95a9d1afc4615e467ee8dc9 (diff)
Merge branch 'perf/urgent' into perf/core, before pulling new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/mtd/ubi/io.c')
-rw-r--r--drivers/mtd/ubi/io.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c
index 5bbd1f094f4e..1fc23e48fe8e 100644
--- a/drivers/mtd/ubi/io.c
+++ b/drivers/mtd/ubi/io.c
@@ -926,6 +926,11 @@ static int validate_vid_hdr(const struct ubi_device *ubi,
goto bad;
}
+ if (data_size > ubi->leb_size) {
+ ubi_err(ubi, "bad data_size");
+ goto bad;
+ }
+
if (vol_type == UBI_VID_STATIC) {
/*
* Although from high-level point of view static volumes may