aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2007-05-05 07:59:23 -0400
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2007-07-18 09:52:42 -0400
commit4ab60a0d7c92cab16f7e470f80ea039a0b174bce (patch)
tree79510835689011701745ce1cfe0f03319a3a1e61 /drivers
parent78d87c95b89ccf86c142494beada3082810ed368 (diff)
UBI: do not let to read too much
In case of static volumes it is prohibited to read more data then available. Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/ubi/kapi.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/mtd/ubi/kapi.c b/drivers/mtd/ubi/kapi.c
index d352c4575c3d..14c66b48798e 100644
--- a/drivers/mtd/ubi/kapi.c
+++ b/drivers/mtd/ubi/kapi.c
@@ -319,9 +319,14 @@ int ubi_leb_read(struct ubi_volume_desc *desc, int lnum, char *buf, int offset,
319 offset + len > vol->usable_leb_size) 319 offset + len > vol->usable_leb_size)
320 return -EINVAL; 320 return -EINVAL;
321 321
322 if (vol->vol_type == UBI_STATIC_VOLUME && lnum == vol->used_ebs - 1 && 322 if (vol->vol_type == UBI_STATIC_VOLUME) {
323 offset + len > vol->last_eb_bytes) 323 if (vol->used_ebs == 0)
324 return -EINVAL; 324 /* Empty static UBI volume */
325 return 0;
326 if (lnum == vol->used_ebs - 1 &&
327 offset + len > vol->last_eb_bytes)
328 return -EINVAL;
329 }
325 330
326 if (vol->upd_marker) 331 if (vol->upd_marker)
327 return -EBADF; 332 return -EBADF;