diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-10-06 17:10:28 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-10-06 17:10:28 +0200 |
commit | 82fc167c392a1700f9adbde639730ee8c8122474 (patch) | |
tree | 373ab737a040dd21e5f98425e7c82a6cc4a83568 /drivers/mtd/ubi/io.c | |
parent | atomic: Implement atomic_read_ctrl() (diff) | |
parent | Linux 4.3-rc4 (diff) | |
download | linux-82fc167c392a1700f9adbde639730ee8c8122474.tar.xz linux-82fc167c392a1700f9adbde639730ee8c8122474.zip |
Merge tag 'v4.3-rc4' into locking/core, to pick up fixes before applying 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.c | 5 |
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 |