* [PATCH] mtd: Remove unneeded checks in part_{read,write}_oob()
@ 2018-01-06 20:49 Boris Brezillon
2018-01-07 10:16 ` Boris Brezillon
0 siblings, 1 reply; 2+ messages in thread
From: Boris Brezillon @ 2018-01-06 20:49 UTC (permalink / raw)
To: David Woodhouse, Brian Norris, Boris Brezillon, Marek Vasut,
Richard Weinberger, Cyrille Pitchen, linux-mtd
Cc: Peter Pan
mtd_{read,write}_oob() are already checking parameters consistency,
remove the checks done in part_{read,write}_oob().
Suggested-by: Peter Pan <peterpansjtu@gmail.com>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
---
drivers/mtd/mtdpart.c | 23 -----------------------
1 file changed, 23 deletions(-)
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index 4d1140c23ead..88f94d672e40 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -117,25 +117,6 @@ static int part_read_oob(struct mtd_info *mtd, loff_t from,
struct mtd_part *part = mtd_to_part(mtd);
int res;
- if (from >= mtd->size)
- return -EINVAL;
- if (ops->datbuf && from + ops->len > mtd->size)
- return -EINVAL;
-
- /*
- * If OOB is also requested, make sure that we do not read past the end
- * of this partition.
- */
- if (ops->oobbuf) {
- size_t len, pages;
-
- len = mtd_oobavail(mtd, ops);
- pages = mtd_div_by_ws(mtd->size, mtd);
- pages -= mtd_div_by_ws(from, mtd);
- if (ops->ooboffs + ops->ooblen > pages * len)
- return -EINVAL;
- }
-
res = mtd_read_oob(part->parent, from + part->offset, ops);
if (unlikely(res)) {
if (mtd_is_bitflip(res))
@@ -194,10 +175,6 @@ static int part_write_oob(struct mtd_info *mtd, loff_t to,
{
struct mtd_part *part = mtd_to_part(mtd);
- if (to >= mtd->size)
- return -EINVAL;
- if (ops->datbuf && to + ops->len > mtd->size)
- return -EINVAL;
return mtd_write_oob(part->parent, to + part->offset, ops);
}
--
2.11.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mtd: Remove unneeded checks in part_{read,write}_oob()
2018-01-06 20:49 [PATCH] mtd: Remove unneeded checks in part_{read,write}_oob() Boris Brezillon
@ 2018-01-07 10:16 ` Boris Brezillon
0 siblings, 0 replies; 2+ messages in thread
From: Boris Brezillon @ 2018-01-07 10:16 UTC (permalink / raw)
To: David Woodhouse, Brian Norris, Boris Brezillon, Marek Vasut,
Richard Weinberger, Cyrille Pitchen, linux-mtd
Cc: Peter Pan
On Sat, 6 Jan 2018 21:49:17 +0100
Boris Brezillon <boris.brezillon@free-electrons.com> wrote:
> mtd_{read,write}_oob() are already checking parameters consistency,
> remove the checks done in part_{read,write}_oob().
Please ignore this patch. I realized I had already submitted a patch
removing redundant checks in various drivers/sub-layers [1], so I'll
just prepare a v2 of this patch integrating the mtdpart changes.
Regards,
Boris
[1]http://patchwork.ozlabs.org/patch/781354/
>
> Suggested-by: Peter Pan <peterpansjtu@gmail.com>
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> ---
> drivers/mtd/mtdpart.c | 23 -----------------------
> 1 file changed, 23 deletions(-)
>
> diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
> index 4d1140c23ead..88f94d672e40 100644
> --- a/drivers/mtd/mtdpart.c
> +++ b/drivers/mtd/mtdpart.c
> @@ -117,25 +117,6 @@ static int part_read_oob(struct mtd_info *mtd, loff_t from,
> struct mtd_part *part = mtd_to_part(mtd);
> int res;
>
> - if (from >= mtd->size)
> - return -EINVAL;
> - if (ops->datbuf && from + ops->len > mtd->size)
> - return -EINVAL;
> -
> - /*
> - * If OOB is also requested, make sure that we do not read past the end
> - * of this partition.
> - */
> - if (ops->oobbuf) {
> - size_t len, pages;
> -
> - len = mtd_oobavail(mtd, ops);
> - pages = mtd_div_by_ws(mtd->size, mtd);
> - pages -= mtd_div_by_ws(from, mtd);
> - if (ops->ooboffs + ops->ooblen > pages * len)
> - return -EINVAL;
> - }
> -
> res = mtd_read_oob(part->parent, from + part->offset, ops);
> if (unlikely(res)) {
> if (mtd_is_bitflip(res))
> @@ -194,10 +175,6 @@ static int part_write_oob(struct mtd_info *mtd, loff_t to,
> {
> struct mtd_part *part = mtd_to_part(mtd);
>
> - if (to >= mtd->size)
> - return -EINVAL;
> - if (ops->datbuf && to + ops->len > mtd->size)
> - return -EINVAL;
> return mtd_write_oob(part->parent, to + part->offset, ops);
> }
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-01-07 10:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-06 20:49 [PATCH] mtd: Remove unneeded checks in part_{read,write}_oob() Boris Brezillon
2018-01-07 10:16 ` Boris Brezillon
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.